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/24 20:52:42 UTC
[camel] branch master updated (cf17df4 -> f664787)
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 cf17df4 Regen catalog
new 36943e4 [CAMEL-11807] Upgrade camel-snmp to junit5
new 20123fb [CAMEL-11807] Upgrade camel-soap to junit5
new 1f9a74c [CAMEL-11807] Upgrade camel-solr to junit5
new 420e581 [CAMEL-11807] Upgrade camel-soroush to junit5
new 9e8b397 [CAMEL-11807] Upgrade camel-spark to junit5
new 0132b28 [CAMEL-11807] Upgrade camel-splunk-hec to junit5
new 2997042 [CAMEL-11807] Upgrade camel-splunk to junit5
new a1270aa [CAMEL-11807] Upgrade camel-spring-batch to junit5
new c3b2840 [CAMEL-11807] Upgrade camel-spring-integration to junit5
new bb700b2 [CAMEL-11807] Upgrade camel-spring-ldap to junit5
new b81a76f [CAMEL-11807] Upgrade camel-spring-ws to junit5
new 2e52203 [CAMEL-11807] Upgrade camel-stax to junit5
new 979d332 [CAMEL-11807] Upgrade camel-stomp to junit5
new 31a53a7 [CAMEL-11807] Upgrade camel-stringtemplate to junit5
new 0753aea [CAMEL-11807] Upgrade camel-tagsoup to junit5
new 13aada9 [CAMEL-11807] Upgrade camel-tarfile to junit5
new 74d595f [CAMEL-11807] Upgrade camel-webhook to junit5
new 63cface [CAMEL-11807] Upgrade camel-thrift to junit5
new 669140d [CAMEL-11807] Upgrade camel-tika to junit5
new a6a5a12 [CAMEL-11807] Upgrade camel-twitter to junit5
new d3fba2f [CAMEL-11807] Upgrade camel-vertx to junit5
new 50e6d4d [CAMEL-11807] Upgrade camel-weather to junit5
new 4f9a3ca [CAMEL-11807] Upgrade camel-web3j to junit5
new 4a849b9 [CAMEL-11807] Upgrade camel-websocket-jsr356 to junit5
new 125263c [CAMEL-11807] Upgrade camel-websocket to junit5
new 274749f [CAMEL-11807] Upgrade camel-weka to junit5
new f664787 [CAMEL-11807] Upgrade camel-wordpress to junit5
The 27 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:
components/camel-snmp/pom.xml | 6 +-
.../apache/camel/component/snmp/PollOIDTest.java | 8 +--
.../apache/camel/component/snmp/ProducerTest.java | 8 +--
.../org/apache/camel/component/snmp/TrapTest.java | 9 +--
.../camel/component/snmp/UriConfigurationTest.java | 14 +++--
.../apache/camel/component/snmp/WalkOIDTest.java | 8 +--
components/camel-soap/pom.xml | 11 +++-
.../converter/soap/name/QNameStrategyTest.java | 7 ++-
.../soap/name/ServiceInterfaceStrategyTest.java | 9 ++-
.../converter/soap/name/TypeNameStrategyTest.java | 20 +++---
...otElementPreferringElementNameStrategyTest.java | 22 ++++---
.../camel/dataformat/soap/SoapClientTest.java | 6 +-
.../camel/dataformat/soap/SoapCxfClientTest.java | 32 +++++-----
.../camel/dataformat/soap/SoapCxfServerTest.java | 22 ++++---
.../camel/dataformat/soap/SoapMarshalTest.java | 4 +-
.../camel/dataformat/soap/SoapRoundtripTest.java | 7 ++-
.../camel/dataformat/soap/SoapServerTest.java | 6 +-
.../dataformat/soap/SoapSpringRoundtripTest.java | 15 ++---
.../dataformat/soap/SoapToSoapDontIgnoreTest.java | 19 +++---
.../dataformat/soap/SoapToSoapIgnoreTest.java | 19 +++---
.../soap/SoapToSoapSingleDataFormatterTest.java | 19 +++---
.../camel/dataformat/soap/SoapUnMarshalTest.java | 7 ++-
.../camel/dataformat/soap12/Soap12MarshalTest.java | 4 +-
.../soap12/Soap12SpringRoundtripTest.java | 15 ++---
.../dataformat/soap12/Soap12UnMarshalTest.java | 7 ++-
components/camel-solr/pom.xml | 2 +-
.../camel/component/solr/InitSolrEndpointTest.java | 19 +++---
.../camel/component/solr/SolrAddBeanTest.java | 10 ++-
.../camel/component/solr/SolrAddBeansTest.java | 14 ++---
.../component/solr/SolrComponentTestSupport.java | 40 +++++++-----
.../camel/component/solr/SolrDeleteTest.java | 20 +++---
.../component/solr/SolrServerMissingTest.java | 4 +-
.../camel/component/solr/SolrTestSupport.java | 6 +-
.../camel/component/solr/SolrTransactionsTest.java | 54 ++++++++--------
.../camel/component/solr/SolrUpdateTest.java | 18 +++---
components/camel-soroush/pom.xml | 2 +-
.../component/ConsumerAutoDownloadFileTest.java | 12 ++--
.../ConsumerAutoReconnectAfterIdleTimeoutTest.java | 2 +-
.../component/ConsumerCamelConcurrentTest.java | 13 ++--
...nsumerExceptionHandledWithErrorHandlerTest.java | 2 +-
.../component/ConsumerMultiThreadTest.java | 2 +-
.../component/ConsumerNativeConcurrentTest.java | 10 +--
.../ConsumerQueueCapacityPerThreadTest.java | 2 +-
.../ConsumerRetryOnConnectionFailureTest.java | 2 +-
.../soroushbot/component/ConsumerTest.java | 7 ++-
...onentialBackOffProducerConnectionRetryTest.java | 11 ++--
.../FixedBackOffProducerConnectionRetryTest.java | 11 ++--
.../HandleExceptionWithErrorHandlerTest.java | 7 ++-
.../LinearBackOffProducerConnectionRetryTest.java | 11 ++--
...etryWaitingTimeProducerConnectionRetryTest.java | 11 ++--
.../ProducerAutoUploadFileIsFalseTest.java | 18 +++---
.../component/ProducerAutoUploadFileTest.java | 21 ++++---
.../component/ProducerConnectionRetryTest.java | 11 ++--
.../component/ProducerDownloadFileTest.java | 17 ++---
.../ProducerDownloadFileWithoutThumbnailTest.java | 18 +++---
.../ProducerMaxConnectionRetryReachedTest.java | 14 +++--
.../soroushbot/component/ProducerTest.java | 11 ++--
.../component/ProducerUploadFileTest.java | 17 ++---
.../soroushbot/service/SoroushServiceTest.java | 32 ++++++----
.../soroushbot/support/SoroushBotTestSupport.java | 10 +--
.../utils/MultiQueueWithTopicThreadPoolTest.java | 72 ++++++++++++----------
components/camel-spark/pom.xml | 6 +-
.../camel/component/spark/SparkProducerTest.java | 10 +--
components/camel-splunk-hec/pom.xml | 4 +-
.../splunkhec/SplunkHECConfigurationTest.java | 6 +-
.../component/splunkhec/SplunkHECEndpointTest.java | 6 +-
.../integration/SplunkHECIntegrationTest.java | 10 +--
components/camel-splunk/pom.xml | 4 +-
.../component/splunk/ConsumerStreamingTest.java | 10 +--
.../camel/component/splunk/ConsumerTest.java | 10 +--
.../camel/component/splunk/ProducerTest.java | 19 +++---
.../camel/component/splunk/RawProducerTest.java | 12 ++--
.../splunk/SplunkComponentConfigurationTest.java | 14 +++--
.../camel/component/splunk/SplunkEventTest.java | 14 +++--
.../component/splunk/SplunkMockTestSupport.java | 8 +--
.../splunk/integration/NormalSearchTest.java | 9 ++-
.../splunk/integration/RealtimeSearchTest.java | 9 ++-
.../splunk/integration/SavedSearchTest.java | 9 ++-
.../splunk/integration/SplunkProducerTest.java | 6 +-
.../component/splunk/integration/SplunkTest.java | 6 +-
components/camel-spring-batch/pom.xml | 6 +-
.../spring/batch/SpringBatchEndpointTest.java | 48 +++++++++------
.../spring/batch/SpringBatchIntegrationTest.java | 8 +--
.../spring/batch/SpringBatchJobLauncherTest.java | 8 +--
.../spring/batch/SpringBatchJobRegistryTest.java | 14 ++---
.../batch/support/CamelItemProcessorTest.java | 6 +-
.../spring/batch/support/CamelItemReaderTest.java | 6 +-
.../spring/batch/support/CamelItemWriterTest.java | 6 +-
.../support/CamelJobExecutionListenerTest.java | 12 ++--
components/camel-spring-integration/pom.xml | 6 +-
.../integration/SpringIntegrationMessageTest.java | 4 +-
.../SpringIntegrationOneWayConsumerTest.java | 4 +-
.../integration/SpringIntegrationProducerTest.java | 10 +--
.../SpringIntegrationTwoWayConsumerTest.java | 9 ++-
.../adapter/CamelSourceAdapterTest.java | 11 ++--
.../adapter/CamelTargetAdapterTest.java | 11 ++--
.../integration/adapter/ConfigurationTest.java | 19 +++---
components/camel-spring-ldap/pom.xml | 4 +-
.../springldap/SpringLdapComponentTest.java | 11 ++--
.../springldap/SpringLdapProducerTest.java | 45 ++++++++------
components/camel-spring-ws/pom.xml | 6 +-
.../spring/ws/ConsumerBreadcrumbIdTest.java | 20 +++---
...ConsumerEndpointMappingByBeanNameRouteTest.java | 10 +--
...erEndpointMappingResponseHandlingRouteTest.java | 10 +--
.../ws/ConsumerEndpointMappingRouteTest.java | 26 +++++---
.../ws/ConsumerExceptionPropagationRouteTest.java | 20 +++---
.../spring/ws/ConsumerMarshallingRouteTest.java | 18 +++---
.../ws/MessageFilterResolvingDefaultsTest.java | 11 ++--
.../spring/ws/MessageFilterResolvingTest.java | 11 ++--
.../spring/ws/ProducerLocalRouteTest.java | 14 +++--
.../spring/ws/ProducerRemoteRouteTest.java | 23 ++++---
.../spring/ws/ProducerRemoteRouteTimeOutTest.java | 16 ++---
.../camel/component/spring/ws/SoapHeaderTest.java | 12 ++--
.../spring/ws/SoapResponseAttachmentTest.java | 6 +-
.../ws/addressing/AbstractConsumerTests.java | 12 ++--
.../spring/ws/addressing/AbstractWSATests.java | 47 +++-----------
.../ws/addressing/CamelDirectSenderTest.java | 10 ++-
.../ConsumerWSAEndpointMappingRouteTest.java | 20 +++---
.../ConsumerWSANewChannelParamsActionTests.java | 2 +
.../ConsumerWSANewChannelParamsToTests.java | 2 +
.../ConsumerWSASameChannelParamsActionTests.java | 2 +
.../ConsumerWSASameChannelParamsToTests.java | 2 +
.../ws/addressing/ProducerParamsBasicTest.java | 14 +++--
.../addressing/ProducerParamsPrecedenceTest.java | 20 +++---
.../ws/filter/impl/BasicMessageFilterTest.java | 11 ++--
.../security/ProducerWss4JSecurityHeaderTest.java | 16 +++--
.../camel/component/spring/ws/utils/TestUtil.java | 8 +--
components/camel-stax/pom.xml | 2 +-
.../component/stax/IssueWithWrongEncodingTest.java | 7 ++-
.../stax/SpringStAXJAXBIteratorExpressionTest.java | 10 +--
.../camel/component/stax/StAXComponentRefTest.java | 10 +--
.../camel/component/stax/StAXComponentTest.java | 10 +--
.../stax/StAXJAXBIteratorExpressionTest.java | 9 +--
.../stax/StAXXPathSplitChoicePerformanceTest.java | 28 +++++----
components/camel-stomp/pom.xml | 6 +-
.../camel/component/stomp/StompBaseTest.java | 13 ++--
.../StompConsumerHeaderFilterStrategyTest.java | 2 +-
.../camel/component/stomp/StompConsumerTest.java | 2 +-
.../component/stomp/StompConsumerUriTest.java | 2 +-
.../component/stomp/StompCustomHeadersTest.java | 4 +-
.../camel/component/stomp/StompProducerTest.java | 7 ++-
components/camel-stringtemplate/pom.xml | 6 +-
.../StringTemplateConcurrentTest.java | 6 +-
.../StringTemplateContentCacheTest.java | 8 +--
.../StringTemplateCustomDelimiterTest.java | 6 +-
.../stringtemplate/StringTemplateLetterTest.java | 4 +-
.../stringtemplate/StringTemplateTest.java | 6 +-
components/camel-tagsoup/pom.xml | 6 +-
.../tagsoup/TidyMarkupDataFormatAsDomNodeTest.java | 18 ++++--
.../tagsoup/TidyMarkupDataFormatAsStringTest.java | 15 +++--
.../dataformat/tagsoup/TidyMarkupTestSupport.java | 9 ---
components/camel-tarfile/pom.xml | 4 +-
.../tarfile/SpringTarFileDataFormatTest.java | 13 ++--
.../tarfile/SpringTarSplitterRouteTest.java | 4 +-
.../dataformat/tarfile/TarFileDataFormatTest.java | 32 +++++-----
.../tarfile/TarFileMultipleFilesSplitterTest.java | 2 +-
.../tarfile/TarFileSplitAndDeleteTest.java | 15 +++--
.../tarfile/TarSplitterRouteIssueTest.java | 10 +--
.../dataformat/tarfile/TarSplitterRouteTest.java | 4 +-
.../AggregationStrategyWithFilenameHeaderTest.java | 21 ++++---
.../AggregationStrategyWithPreservationTest.java | 20 +++---
.../tarfile/TarAggregationStrategyTest.java | 17 +++--
.../test/junit5/params/ParameterizedExtension.java | 30 +++++++--
components/camel-thrift/pom.xml | 6 +-
.../component/thrift/ThriftConsumerAsyncTest.java | 16 +++--
.../thrift/ThriftConsumerConcurrentTest.java | 11 ++--
.../thrift/ThriftConsumerSecurityTest.java | 16 +++--
.../component/thrift/ThriftConsumerSyncTest.java | 16 +++--
.../thrift/ThriftConsumerZlibCompressionTest.java | 16 +++--
.../component/thrift/ThriftProducerAsyncTest.java | 9 ++-
.../component/thrift/ThriftProducerBaseTest.java | 10 +--
.../thrift/ThriftProducerSecurityTest.java | 22 ++++---
.../component/thrift/ThriftProducerSyncTest.java | 12 +++-
.../thrift/ThriftProducerZlibCompressionTest.java | 17 +++--
.../thrift/local/ThriftThreadPoolServerTest.java | 14 +++--
.../thrift/ThriftMarshalAndUnmarshalJsonTest.java | 6 +-
.../ThriftMarshalAndUnmarshalSpringTest.java | 10 ++-
.../thrift/ThriftMarshalAndUnmarshalTest.java | 10 ++-
components/camel-tika/pom.xml | 6 +-
.../camel/component/tika/TikaDetectTest.java | 5 +-
.../apache/camel/component/tika/TikaParseTest.java | 13 ++--
components/camel-twitter/pom.xml | 11 +++-
.../AbstractComponentVerifierExtensionTest.java | 33 +++++-----
.../twitter/AbstractComponentVerifierTest.java | 31 +++++-----
.../twitter/CamelTwitterConsumerTestSupport.java | 2 +-
.../component/twitter/CamelTwitterTestSupport.java | 5 +-
.../component/twitter/DirectMessageDirectTest.java | 4 +-
.../twitter/DirectMessagePollingTest.java | 4 +-
.../twitter/DirectMessageProducerTest.java | 4 +-
.../twitter/SearchByExchangeDirectTest.java | 4 +-
.../component/twitter/UriConfigurationTest.java | 26 ++++----
.../component/twitter/UserProducerInOnlyTest.java | 4 +-
.../component/twitter/UserProducerInOutTest.java | 4 +-
...witterSearchComponentVerifierExtensionTest.java | 23 ++++---
.../search/TwitterSearchComponentVerifierTest.java | 23 ++++---
components/camel-vertx/pom.xml | 2 +-
.../component/vertx/VertxBaseTestSupport.java | 10 ++-
.../component/vertx/VertxMultipleConsumerTest.java | 2 +-
.../component/vertx/VertxRequestReplyTest.java | 4 +-
.../component/vertx/VertxRoutePubSubTest.java | 2 +-
.../camel/component/vertx/VertxRouteTest.java | 2 +-
components/camel-weather/pom.xml | 9 ++-
.../component/weather/BaseWeatherConsumerTest.java | 14 ++++-
...rentWeatherConsumerGeolocationProviderTest.java | 7 ++-
.../weather/CurrentWeatherConsumerHtmlTest.java | 2 +
.../weather/CurrentWeatherConsumerTest.java | 2 +
.../weather/CurrentWeatherConsumerXmlTest.java | 2 +
.../weather/CurrentWeatherMadridProducerTest.java | 5 +-
.../camel/component/weather/WeatherQueryTest.java | 12 ++--
components/camel-web3j/pom.xml | 8 +--
.../Web3jConsumerBlockObservableMockTest.java | 2 +-
...tAndSubscribeToNewBlocksObservableMockTest.java | 2 +-
...bscribeToNewTransactionsObservableMockTest.java | 2 +-
...merCatchUpToLatestBlocksObservableMockTest.java | 2 +-
...chUpToLatestTransactionsObservableMockTest.java | 2 +-
...eb3jConsumerEthBlockHashObservableMockTest.java | 2 +-
.../Web3jConsumerEthLogObservableMockTest.java | 2 +-
...thPendingTransactionHashObservableMockTest.java | 2 +-
...nsumerPendingTransactionObservableMockTest.java | 2 +-
...Web3jConsumerReplyBlocksObservableMockTest.java | 2 +-
...onsumerReplyTransactionsObservableMockTest.java | 2 +-
...Web3jConsumerTransactionObservableMockTest.java | 2 +-
.../component/web3j/Web3jMockTestSupport.java | 14 ++---
.../camel/component/web3j/Web3jProducerTest.java | 3 +-
.../component/web3j/Web3jQuorumProducerTest.java | 4 +-
.../integration/Web3jConsumerBlockHashTest.java | 6 +-
.../web3j/integration/Web3jConsumerBlockTest.java | 6 +-
.../web3j/integration/Web3jConsumerLogTest.java | 6 +-
.../integration/Web3jConsumerMainnetTest.java | 6 +-
.../integration/Web3jConsumerReplayBlockTest.java | 6 +-
.../integration/Web3jConsumerTransactionsTest.java | 6 +-
.../integration/Web3jIntegrationTestSupport.java | 2 +-
.../integration/Web3jProducerGanacheTest.java | 43 ++++++-------
.../integration/Web3jProducerMainnetTest.java | 7 ++-
components/camel-webhook/pom.xml | 2 +-
.../component/webhook/WebhookBasePathTest.java | 15 +++--
.../component/webhook/WebhookHttpBindingTest.java | 12 ++--
.../component/webhook/WebhookMultiRouteTest.java | 4 +-
.../camel/component/webhook/WebhookPathTest.java | 10 ++-
.../component/webhook/WebhookRegistrationTest.java | 8 ++-
.../camel/component/webhook/WebhookTestBase.java | 6 +-
.../component/webhook/WebhookUriEncodingTest.java | 4 +-
components/camel-websocket-jsr356/pom.xml | 6 +-
.../camel/websocket/jsr356/JSR356ConsumerTest.java | 45 +++++++-------
.../camel/websocket/jsr356/JSR356ProducerTest.java | 35 ++++++-----
.../ServerEndpointDeploymentStrategyTest.java | 21 +++----
components/camel-websocket/pom.xml | 8 +--
.../component/websocket/DefaultWebsocketTest.java | 18 +++---
.../websocket/MemoryWebsocketStoreTest.java | 31 +++++-----
.../websocket/NodeSynchronizationImplTest.java | 26 ++++----
.../websocket/WebsocketClientCamelRouteTest.java | 16 +++--
.../WebsocketComponentRouteExampleTest.java | 16 +++--
.../websocket/WebsocketComponentServletTest.java | 18 +++---
.../websocket/WebsocketComponentTest.java | 25 ++++----
.../websocket/WebsocketConsumerRouteTest.java | 10 +--
.../component/websocket/WebsocketConsumerTest.java | 11 ++--
.../WebsocketEndpointConfigurationTest.java | 47 +++++++-------
.../component/websocket/WebsocketEndpointTest.java | 17 +++--
.../WebsocketProducerRouteExampleTest.java | 18 ++++--
.../WebsocketProducerRouteRestartTest.java | 18 ++++--
.../component/websocket/WebsocketProducerTest.java | 25 ++++----
.../websocket/WebsocketRouteExampleTest.java | 17 +++--
.../WebsocketSSLClientAuthRouteExampleTest.java | 21 ++++---
.../WebsocketSSLContextGlobalRouteExampleTest.java | 15 +++--
.../WebsocketSSLContextInUriRouteExampleTest.java | 15 +++--
.../websocket/WebsocketSSLRouteExampleTest.java | 21 ++++---
.../component/websocket/WebsocketStaticTest.java | 18 ++++--
.../websocket/WebsocketTwoRoutesExampleTest.java | 15 +++--
...SIndividualAndBroadcastEndpointExampleTest.java | 15 +++--
...ebsocketTwoRoutesToSameEndpointExampleTest.java | 15 +++--
components/camel-weka/pom.xml | 4 +-
.../camel/component/weka/DecisionTreeTest.java | 17 ++---
.../apache/camel/component/weka/FilterTest.java | 13 ++--
.../camel/component/weka/PredictionTest.java | 7 ++-
.../apache/camel/component/weka/ReadWriteTest.java | 24 ++++----
components/camel-wordpress/pom.xml | 2 +-
.../wordpress/WordpressComponentTest.java | 6 +-
.../wordpress/WordpressComponentTestSupport.java | 10 +--
.../wordpress/WordpressPostOperationTest.java | 3 +-
.../wordpress/WordpressUserOperationTest.java | 3 +-
.../wordpress/api/model/PublishableStatusTest.java | 15 +++--
.../impl/WordpressServicePostsAdapterTest.java | 8 +--
.../impl/WordpressServiceUsersAdapterTest.java | 8 +--
.../WordpressServiceCategoriesAdapterIT.java | 12 ++--
.../ignored/WordpressServiceCommentsAdapterIT.java | 12 ++--
.../ignored/WordpressServicePagesAdapterIT.java | 12 ++--
.../WordpressServicePostRevisionAdapterIT.java | 12 ++--
.../ignored/WordpressServiceTagsAdapterIT.java | 12 ++--
.../ignored/WordpressServiceTaxonomyAdapterIT.java | 12 ++--
.../api/test/WordpressMockServerTestSupport.java | 8 +--
290 files changed, 1958 insertions(+), 1469 deletions(-)
[camel] 17/27: [CAMEL-11807] Upgrade camel-webhook 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 74d595f36bcc9ac79ef7792280dea67fa9e5e094
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 11:58:53 2020 +0200
[CAMEL-11807] Upgrade camel-webhook to junit5
---
components/camel-webhook/pom.xml | 2 +-
.../camel/component/webhook/WebhookBasePathTest.java | 15 ++++++++++-----
.../camel/component/webhook/WebhookHttpBindingTest.java | 12 ++++++++----
.../camel/component/webhook/WebhookMultiRouteTest.java | 4 +++-
.../apache/camel/component/webhook/WebhookPathTest.java | 10 +++++++---
.../camel/component/webhook/WebhookRegistrationTest.java | 8 +++++---
.../apache/camel/component/webhook/WebhookTestBase.java | 6 +++---
.../camel/component/webhook/WebhookUriEncodingTest.java | 4 +++-
8 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/components/camel-webhook/pom.xml b/components/camel-webhook/pom.xml
index 80762e6..5dad6eb 100644
--- a/components/camel-webhook/pom.xml
+++ b/components/camel-webhook/pom.xml
@@ -40,7 +40,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-webhook/src/test/java/org/apache/camel/component/webhook/WebhookBasePathTest.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookBasePathTest.java
index ec7da63..b36acd5 100644
--- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookBasePathTest.java
+++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookBasePathTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-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.assertThrows;
public class WebhookBasePathTest extends WebhookTestBase {
@@ -45,14 +48,16 @@ public class WebhookBasePathTest extends WebhookTestBase {
assertEquals("auto: webhook", result);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testRootPathError() {
- template.requestBody("netty-http:http://localhost:" + port, "", String.class);
+ assertThrows(CamelExecutionException.class,
+ () -> template.requestBody("netty-http:http://localhost:" + port, "", String.class));
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testRootBasePathError() {
- template.requestBody("netty-http:http://localhost:" + port + "/base/", "", String.class);
+ assertThrows(CamelExecutionException.class,
+ () -> template.requestBody("netty-http:http://localhost:" + port + "/base/", "", String.class));
}
@Override
diff --git a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookHttpBindingTest.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookHttpBindingTest.java
index 8e42d21..7e94b96 100644
--- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookHttpBindingTest.java
+++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookHttpBindingTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-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.assertThrows;
public class WebhookHttpBindingTest extends WebhookTestBase {
@@ -39,10 +42,11 @@ public class WebhookHttpBindingTest extends WebhookTestBase {
assertEquals("msg: webhook", result);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testGetError() {
- template.requestBodyAndHeader("netty-http:http://localhost:" + port, "",
- Exchange.HTTP_METHOD, "GET", String.class);
+ assertThrows(CamelExecutionException.class, () ->
+ template.requestBodyAndHeader("netty-http:http://localhost:" + port, "",
+ Exchange.HTTP_METHOD, "GET", String.class));
}
@Override
diff --git a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookMultiRouteTest.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookMultiRouteTest.java
index 5a0b0c3..8b12e83 100644
--- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookMultiRouteTest.java
+++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookMultiRouteTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class WebhookMultiRouteTest extends WebhookTestBase {
diff --git a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookPathTest.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookPathTest.java
index a8a07f8f..7699b52 100644
--- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookPathTest.java
+++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookPathTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-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.assertThrows;
public class WebhookPathTest extends WebhookTestBase {
@@ -38,9 +41,10 @@ public class WebhookPathTest extends WebhookTestBase {
assertEquals("uri: webhook", result);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testRootPathError() {
- template.requestBody("netty-http:http://localhost:" + port, "", String.class);
+ assertThrows(CamelExecutionException.class, () ->
+ template.requestBody("netty-http:http://localhost:" + port, "", String.class));
}
@Override
diff --git a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookRegistrationTest.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookRegistrationTest.java
index 512bc1c..9bc3f1c 100644
--- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookRegistrationTest.java
+++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookRegistrationTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
import org.awaitility.Awaitility;
-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 WebhookRegistrationTest extends WebhookTestBase {
@@ -32,7 +34,7 @@ public class WebhookRegistrationTest extends WebhookTestBase {
private AtomicInteger unregistered;
- @Before
+ @BeforeEach
public void initialize() {
this.registered = new AtomicInteger(0);
this.unregistered = new AtomicInteger(0);
diff --git a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
index 38db5b0..71cfadf 100644
--- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
+++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
@@ -17,14 +17,14 @@
package org.apache.camel.component.webhook;
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;
public class WebhookTestBase extends CamelTestSupport {
protected static int port;
- @BeforeClass
+ @BeforeAll
public static void initPort() {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
index 574f9a0..80ae995 100644
--- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
+++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.webhook.support.TestComponent;
import org.apache.camel.spi.Registry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class WebhookUriEncodingTest extends WebhookTestBase {
[camel] 25/27: [CAMEL-11807] Upgrade camel-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 125263cf60478ae57c211542e17a31a7a0307e57
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 16:18:40 2020 +0200
[CAMEL-11807] Upgrade camel-websocket to junit5
---
components/camel-websocket/pom.xml | 8 ++--
.../component/websocket/DefaultWebsocketTest.java | 18 ++++-----
.../websocket/MemoryWebsocketStoreTest.java | 31 +++++++-------
.../websocket/NodeSynchronizationImplTest.java | 26 ++++++------
.../websocket/WebsocketClientCamelRouteTest.java | 16 +++++---
.../WebsocketComponentRouteExampleTest.java | 16 +++++---
.../websocket/WebsocketComponentServletTest.java | 18 ++++-----
.../websocket/WebsocketComponentTest.java | 25 ++++++------
.../websocket/WebsocketConsumerRouteTest.java | 10 ++---
.../component/websocket/WebsocketConsumerTest.java | 11 +++--
.../WebsocketEndpointConfigurationTest.java | 47 +++++++++++-----------
.../component/websocket/WebsocketEndpointTest.java | 17 ++++----
.../WebsocketProducerRouteExampleTest.java | 18 ++++++---
.../WebsocketProducerRouteRestartTest.java | 18 ++++++---
.../component/websocket/WebsocketProducerTest.java | 25 ++++++------
.../websocket/WebsocketRouteExampleTest.java | 17 +++++---
.../WebsocketSSLClientAuthRouteExampleTest.java | 21 ++++++----
.../WebsocketSSLContextGlobalRouteExampleTest.java | 15 +++++--
.../WebsocketSSLContextInUriRouteExampleTest.java | 15 +++++--
.../websocket/WebsocketSSLRouteExampleTest.java | 21 ++++++----
.../component/websocket/WebsocketStaticTest.java | 18 ++++++---
.../websocket/WebsocketTwoRoutesExampleTest.java | 15 +++++--
...SIndividualAndBroadcastEndpointExampleTest.java | 15 +++++--
...ebsocketTwoRoutesToSameEndpointExampleTest.java | 15 +++++--
24 files changed, 275 insertions(+), 181 deletions(-)
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index 5a5437e..31d9655 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -88,17 +88,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-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java
index 5bea362..6b2ef15 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java
@@ -19,21 +19,21 @@ package org.apache.camel.component.websocket;
import java.net.InetSocketAddress;
import org.eclipse.jetty.websocket.api.Session;
-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.InOrder;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
-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.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class DefaultWebsocketTest {
private static final int CLOSE_CODE = -1;
@@ -51,7 +51,7 @@ public class DefaultWebsocketTest {
private DefaultWebsocket defaultWebsocket;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
defaultWebsocket = new DefaultWebsocket(sync, null, consumer);
defaultWebsocket.setConnectionKey(CONNECTION_KEY);
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java
index b8b7e12..f979f98 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java
@@ -18,20 +18,21 @@ package org.apache.camel.component.websocket;
import java.util.Collection;
-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 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.Assert.fail;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+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.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class MemoryWebsocketStoreTest {
private static final String KEY_1 = "one";
@@ -48,7 +49,7 @@ public class MemoryWebsocketStoreTest {
private MemoryWebsocketStore store;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
store = new MemoryWebsocketStore();
when(websocket1.getConnectionKey()).thenReturn(KEY_1);
@@ -66,9 +67,11 @@ public class MemoryWebsocketStoreTest {
assertEquals(websocket2, store.get(KEY_2));
}
- @Test(expected = NullPointerException.class)
+ @Test
public void testAddNullValue() {
- store.add(null);
+ assertThrows(NullPointerException.class, () -> {
+ store.add(null);
+ });
}
@Test
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java
index cb1df0a..329acd5 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java
@@ -16,18 +16,18 @@
*/
package org.apache.camel.component.websocket;
-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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+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.fail;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class NodeSynchronizationImplTest {
private static final String KEY_1 = "one";
@@ -44,7 +44,7 @@ public class NodeSynchronizationImplTest {
private MemoryWebsocketStore store1;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
store1 = new MemoryWebsocketStore();
@@ -84,9 +84,11 @@ public class NodeSynchronizationImplTest {
/**
* Test method for {@link org.apache.camel.component.websocket.NodeSynchronization#addSocket(org.apache.camel.component.websocket.DefaultWebsocket)} .
*/
- @Test(expected = NullPointerException.class)
+ @Test
public void testAddNullValue() {
- sync.addSocket(null);
+ assertThrows(NullPointerException.class, () -> {
+ sync.addSocket(null);
+ });
}
/**
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java
index 10c911a..c9bb936 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java
@@ -23,24 +23,30 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketClientCamelRouteTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch = new CountDownLatch(10);
- protected int port;
+ private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
index 76a1c57..9fd3723 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
@@ -23,24 +23,30 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketComponentRouteExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch = new CountDownLatch(1);
- protected int port;
+ private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
index 15e5d01..8e41879 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
@@ -22,16 +22,16 @@ import java.util.Map;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-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.InOrder;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
-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.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.when;
/**
*
*/
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class WebsocketComponentServletTest {
private static final String PROTOCOL = "ws";
@@ -60,7 +60,7 @@ public class WebsocketComponentServletTest {
private Map<String, WebSocketFactory> socketFactory;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
socketFactory = new HashMap<>();
socketFactory.put("default", new DefaultWebsocketFactory());
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
index dfc7206..16da430 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
@@ -25,26 +25,25 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-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.InOrder;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.mockito.junit.jupiter.MockitoSettings;
+
+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.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class WebsocketComponentTest {
private static final String PATH_ONE = "foo";
@@ -66,7 +65,7 @@ public class WebsocketComponentTest {
private WebsocketProducer producer;
private Server server;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
component = new WebsocketComponent();
component.setCamelContext(new DefaultCamelContext());
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
index 7a6476c..8022171 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
@@ -19,21 +19,21 @@ package org.apache.camel.component.websocket;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class WebsocketConsumerRouteTest extends CamelTestSupport {
- protected int port;
+ private int port;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java
index 6b39791..9a703e1 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java
@@ -22,12 +22,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.spi.ExceptionHandler;
-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.InOrder;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
@@ -36,7 +35,7 @@ import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class WebsocketConsumerTest {
private static final String CONNECTION_KEY = "random-connection-key";
@@ -57,7 +56,7 @@ public class WebsocketConsumerTest {
private Exception exception = new Exception("BAD NEWS EVERYONE!");
private WebsocketConsumer websocketConsumer;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
websocketConsumer = new WebsocketConsumer(endpoint, processor);
websocketConsumer.setExceptionHandler(exceptionHandler);
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
index ad622e6..39dda06 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
@@ -20,18 +20,19 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.component.websocket.WebsocketComponent.ConnectorRef;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
private int port;
@@ -58,28 +59,28 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
ServletContextHandler context = (ServletContextHandler)conector.server.getHandler();
String buffersize = context.getInitParameter("bufferSize");
- assertEquals("Got a wrong buffersize", "25000", buffersize);
+ assertEquals("25000", buffersize, "Got a wrong buffersize");
String maxIdleTime = context.getInitParameter("maxIdleTime");
- assertEquals("Got a wrong maxIdleTime", "3000", maxIdleTime);
+ assertEquals("3000", maxIdleTime, "Got a wrong maxIdleTime");
String maxTextMessageSize = context.getInitParameter("maxTextMessageSize");
- assertEquals("Got a wrong maxTextMessageSize", "500", maxTextMessageSize);
+ assertEquals("500", maxTextMessageSize, "Got a wrong maxTextMessageSize");
String maxBinaryMessageSize = context.getInitParameter("maxBinaryMessageSize");
- assertEquals("Got a wrong maxBinaryMessageSize", "550", maxBinaryMessageSize);
+ assertEquals("550", maxBinaryMessageSize, "Got a wrong maxBinaryMessageSize");
WebSocketServletFactory factory = (WebSocketServletFactory)context.getServletContext().getAttribute(WebSocketServletFactory.class.getName());
int factoryBufferSize = factory.getPolicy().getInputBufferSize();
- assertEquals("Got a wrong buffersize", 25000, factoryBufferSize);
+ assertEquals(25000, factoryBufferSize, "Got a wrong buffersize");
long factoryMaxIdleTime = factory.getPolicy().getIdleTimeout();
- assertEquals("Got a wrong maxIdleTime", 3000, factoryMaxIdleTime);
+ assertEquals(3000, factoryMaxIdleTime, "Got a wrong maxIdleTime");
int factoryMaxTextMessageSize = factory.getPolicy().getMaxTextMessageSize();
- assertEquals("Got a wrong maxTextMessageSize", 500, factoryMaxTextMessageSize);
+ assertEquals(500, factoryMaxTextMessageSize, "Got a wrong maxTextMessageSize");
int factoryMaxBinaryMessageSize = factory.getPolicy().getMaxBinaryMessageSize();
- assertEquals("Got a wrong maxBinaryMessageSize", 550, factoryMaxBinaryMessageSize);
+ assertEquals(550, factoryMaxBinaryMessageSize, "Got a wrong maxBinaryMessageSize");
}
@Test
public void testSetServletNoMinThreadsNoMaxThreadsNoThreadPool() throws Exception {
- assumeTrue("At lease 18 CPUs available", 1 + Runtime.getRuntime().availableProcessors() * 2 >= 19);
+ assumeTrue(1 + Runtime.getRuntime().availableProcessors() * 2 >= 19, "At lease 18 CPUs available");
port = AvailablePortFinder.getNextAvailable();
String uri = "websocket://localhost:" + port + "/bar?bufferSize=25000&maxIdleTime=3000";
WebsocketEndpoint websocketEndpoint = (WebsocketEndpoint)context.getEndpoint(uri);
@@ -94,15 +95,15 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
ServletContextHandler context = (ServletContextHandler)conector.server.getHandler();
String buffersize = context.getInitParameter("bufferSize");
- assertEquals("Got a wrong buffersize", "25000", buffersize);
+ assertEquals("25000", buffersize, "Got a wrong buffersize");
String maxIdleTime = context.getInitParameter("maxIdleTime");
- assertEquals("Got a wrong maxIdleTime", "3000", maxIdleTime);
+ assertEquals("3000", maxIdleTime, "Got a wrong maxIdleTime");
WebSocketServletFactory factory = (WebSocketServletFactory)context.getServletContext().getAttribute(WebSocketServletFactory.class.getName());
int factoryBufferSize = factory.getPolicy().getInputBufferSize();
- assertEquals("Got a wrong buffersize", 25000, factoryBufferSize);
+ assertEquals(25000, factoryBufferSize, "Got a wrong buffersize");
long factoryMaxIdleTime = factory.getPolicy().getIdleTimeout();
- assertEquals("Got a wrong maxIdleTime", 3000, factoryMaxIdleTime);
+ assertEquals(3000, factoryMaxIdleTime, "Got a wrong maxIdleTime");
}
@Test
@@ -123,15 +124,15 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
ServletContextHandler context = (ServletContextHandler)conector.server.getHandler();
String buffersize = context.getInitParameter("bufferSize");
- assertEquals("Got a wrong buffersize", "25000", buffersize);
+ assertEquals("25000", buffersize, "Got a wrong buffersize");
String maxIdleTime = context.getInitParameter("maxIdleTime");
- assertEquals("Got a wrong maxIdleTime", "3000", maxIdleTime);
+ assertEquals("3000", maxIdleTime, "Got a wrong maxIdleTime");
WebSocketServletFactory factory = (WebSocketServletFactory)context.getServletContext().getAttribute(WebSocketServletFactory.class.getName());
int factoryBufferSize = factory.getPolicy().getInputBufferSize();
- assertEquals("Got a wrong buffersize", 25000, factoryBufferSize);
+ assertEquals(25000, factoryBufferSize, "Got a wrong buffersize");
long factoryMaxIdleTime = factory.getPolicy().getIdleTimeout();
- assertEquals("Got a wrong maxIdleTime", 3000, factoryMaxIdleTime);
+ assertEquals(3000, factoryMaxIdleTime, "Got a wrong maxIdleTime");
}
}
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java
index 7f3135d..82ab730 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java
@@ -19,23 +19,22 @@ package org.apache.camel.component.websocket;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-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.InOrder;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+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.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class WebsocketEndpointTest {
private static final String REMAINING = "foo/bar";
@@ -49,7 +48,7 @@ public class WebsocketEndpointTest {
private WebsocketEndpoint websocketEndpoint;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
websocketEndpoint = new WebsocketEndpoint(component, URI, REMAINING, null);
component = new WebsocketComponent();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
index 4c93506..631cc36 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
@@ -26,26 +26,34 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketProducerRouteExampleTest extends CamelTestSupport {
private static List<Object> received = new ArrayList<>();
private static CountDownLatch latch;
- protected int port;
+
+ private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Produce("direct:shop")
private ProducerTemplate producer;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java
index 37603b8..60155dd 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java
@@ -25,27 +25,35 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketProducerRouteRestartTest extends CamelTestSupport {
private static final String ROUTE_ID = WebsocketProducerRouteRestartTest.class.getSimpleName();
+
private static List<Object> received = new ArrayList<>();
private static CountDownLatch latch;
- protected int port;
+
+ private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Produce("direct:shop")
private ProducerTemplate producer;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java
index 4c84888..b4b8005 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java
@@ -24,24 +24,23 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.eclipse.jetty.websocket.api.RemoteEndpoint;
import org.eclipse.jetty.websocket.api.Session;
-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.InOrder;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-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.Assert.fail;
+import org.mockito.junit.jupiter.MockitoSettings;
+
+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.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class WebsocketProducerTest {
private static final String MESSAGE = "MESSAGE";
@@ -69,7 +68,7 @@ public class WebsocketProducerTest {
private WebsocketProducer websocketProducer;
private Collection<DefaultWebsocket> sockets;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
websocketProducer = new WebsocketProducer(endpoint);
websocketProducer.setStore(store);
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java
index f62e56f..606aa19 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java
@@ -23,23 +23,30 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketRouteExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch = new CountDownLatch(1);
- protected int port;
+
+ private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
index 7400063..810c917 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.AsyncHttpClientConfig;
import org.asynchttpclient.DefaultAsyncHttpClient;
@@ -43,19 +43,26 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketSSLClientAuthRouteExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch = new CountDownLatch(10);
- protected Properties originalValues = new Properties();
- protected String pwd = "changeit";
- protected int port;
+
+ private Properties originalValues = new Properties();
+ private String pwd = "changeit";
+ private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
index 6ae1db3..c70eeb1 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
@@ -36,7 +36,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.AsyncHttpClientConfig;
import org.asynchttpclient.DefaultAsyncHttpClient;
@@ -44,20 +44,27 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketSSLContextGlobalRouteExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch = new CountDownLatch(10);
+
private String pwd = "changeit";
private String uri;
private String server = "127.0.0.1";
private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
index 6d41887..f1af5a8 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
@@ -36,7 +36,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.AsyncHttpClientConfig;
import org.asynchttpclient.DefaultAsyncHttpClient;
@@ -44,20 +44,27 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch = new CountDownLatch(10);
+
private String pwd = "changeit";
private String uri;
private String server = "127.0.0.1";
private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
index 15108b7..966a75f 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.AsyncHttpClientConfig;
import org.asynchttpclient.DefaultAsyncHttpClient;
@@ -43,19 +43,26 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketSSLRouteExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch = new CountDownLatch(10);
- protected Properties originalValues = new Properties();
- protected String pwd = "changeit";
- protected int port;
+
+ private Properties originalValues = new Properties();
+ private String pwd = "changeit";
+ private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java
index 70d3bab..577f069 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java
@@ -23,24 +23,32 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.Response;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketStaticTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch = new CountDownLatch(1);
- protected int port;
+
+ private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java
index 7f57434..f2f93be 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java
@@ -23,23 +23,30 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketTwoRoutesExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch;
+
private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
index 31baf3e..5c43bab 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java
@@ -23,23 +23,30 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch;
+
private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
index 4ee02ef..8f659ba 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java
@@ -23,22 +23,29 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class WebsocketTwoRoutesToSameEndpointExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<>();
private static CountDownLatch latch;
+
private int port;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
super.setUp();
[camel] 24/27: [CAMEL-11807] Upgrade camel-websocket-jsr356 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 4a849b9e01631045b671c4ac8f3b9c2dc4cf8daf
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 15:35:47 2020 +0200
[CAMEL-11807] Upgrade camel-websocket-jsr356 to junit5
---
components/camel-websocket-jsr356/pom.xml | 6 +--
.../camel/websocket/jsr356/JSR356ConsumerTest.java | 45 ++++++++++++----------
.../camel/websocket/jsr356/JSR356ProducerTest.java | 35 +++++++++--------
.../ServerEndpointDeploymentStrategyTest.java | 21 +++++-----
4 files changed, 55 insertions(+), 52 deletions(-)
diff --git a/components/camel-websocket-jsr356/pom.xml b/components/camel-websocket-jsr356/pom.xml
index b813621..374eeb1 100644
--- a/components/camel-websocket-jsr356/pom.xml
+++ b/components/camel-websocket-jsr356/pom.xml
@@ -61,12 +61,12 @@
<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-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ConsumerTest.java b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ConsumerTest.java
index 018143f..14c9111 100644
--- a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ConsumerTest.java
+++ b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ConsumerTest.java
@@ -32,29 +32,31 @@ import javax.websocket.server.ServerEndpoint;
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.meecrowave.Meecrowave;
-import org.apache.meecrowave.junit.MeecrowaveRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
+import org.apache.meecrowave.junit5.MeecrowaveConfig;
+import org.apache.meecrowave.testing.ConfigurationInject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+@MeecrowaveConfig(scanningPackageIncludes = "org.apache.camel.websocket.jsr356.JSR356ConsumerTest$")
public class JSR356ConsumerTest extends CamelTestSupport {
- @Rule
- public final MeecrowaveRule servlet = new MeecrowaveRule(new Meecrowave.Builder() {
- {
- randomHttpPort();
- setScanningPackageIncludes("org.apache.camel.websocket.jsr356.JSR356ConsumerTest$");
- }
- }, "");
- @Rule
- public final TestName testName = new TestName();
+ @ConfigurationInject
+ protected Meecrowave.Builder configuration;
+
+ protected String testMethodName;
+
+ @Override
+ public void beforeEach(ExtensionContext context) throws Exception {
+ super.beforeEach(context);
+ testMethodName = context.getRequiredTestMethod().getName();
+ }
@Test
public void ensureClientModeReceiveProperlyExchanges() throws Exception {
- final String message = ExistingServerEndpoint.class.getName() + "#" + testName.getMethodName();
- final MockEndpoint mockEndpoint = getMockEndpoint("mock:" + testName.getMethodName());
+ final String message = ExistingServerEndpoint.class.getName() + "#" + testMethodName;
+ final MockEndpoint mockEndpoint = getMockEndpoint("mock:" + testMethodName);
mockEndpoint.expectedBodiesReceived(message);
ExistingServerEndpoint.doSend(); // to avoid lifecycle issue during
// startup we send the message
@@ -65,8 +67,8 @@ public class JSR356ConsumerTest extends CamelTestSupport {
@Test
public void ensureServerModeReceiveProperlyExchanges() throws Exception {
- final String message = getClass().getName() + "#" + testName.getMethodName();
- final MockEndpoint mockEndpoint = getMockEndpoint("mock:" + testName.getMethodName());
+ final String message = getClass().getName() + "#" + testMethodName;
+ final MockEndpoint mockEndpoint = getMockEndpoint("mock:" + testMethodName);
mockEndpoint.expectedBodiesReceived(message);
final WebSocketContainer container = ContainerProvider.getWebSocketContainer();
@@ -75,7 +77,7 @@ public class JSR356ConsumerTest extends CamelTestSupport {
public void onOpen(final Session session, final EndpointConfig config) {
// no-op
}
- }, ClientEndpointConfig.Builder.create().build(), URI.create("ws://localhost:" + servlet.getConfiguration().getHttpPort() + "/test"));
+ }, ClientEndpointConfig.Builder.create().build(), URI.create("ws://localhost:" + configuration.getHttpPort() + "/test"));
session.getBasicRemote().sendText(message);
session.close(new CloseReason(CloseReason.CloseCodes.GOING_AWAY, "bye"));
@@ -86,9 +88,10 @@ public class JSR356ConsumerTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("websocket-jsr356:///test?sessionCount=5").id("camel_consumer_acts_as_server").convertBodyTo(String.class).to("mock:ensureServerModeReceiveProperlyExchanges");
+ from("websocket-jsr356:///test?sessionCount=5").id("camel_consumer_acts_as_server").convertBodyTo(String.class)
+ .to("mock:ensureServerModeReceiveProperlyExchanges");
- from("websocket-jsr356://ws://localhost:" + servlet.getConfiguration().getHttpPort() + "/existingserver?sessionCount=5").id("camel_consumer_acts_as_client")
+ from("websocket-jsr356://ws://localhost:" + configuration.getHttpPort() + "/existingserver?sessionCount=5").id("camel_consumer_acts_as_client")
.convertBodyTo(String.class).to("mock:ensureClientModeReceiveProperlyExchanges");
}
};
diff --git a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
index c370e8e..35a4f40 100644
--- a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
+++ b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
@@ -26,34 +26,37 @@ import javax.websocket.server.ServerEndpoint;
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.apache.meecrowave.Meecrowave;
-import org.apache.meecrowave.junit.MeecrowaveRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
+import org.apache.meecrowave.junit5.MeecrowaveConfig;
+import org.apache.meecrowave.testing.ConfigurationInject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@MeecrowaveConfig(scanningPackageIncludes = "org.apache.camel.websocket.jsr356.JSR356ProducerTest$")
public class JSR356ProducerTest extends CamelTestSupport {
private static LinkedBlockingQueue<String> messages = new LinkedBlockingQueue<>();
- @Rule
- public final MeecrowaveRule servlet = new MeecrowaveRule(new Meecrowave.Builder() {
- {
- randomHttpPort();
- setScanningPackageIncludes("org.apache.camel.websocket.jsr356.JSR356ProducerTest$");
- }
- }, "");
+ @ConfigurationInject
+ protected Meecrowave.Builder configuration;
- @Rule
- public final TestName testName = new TestName();
+ protected String testMethodName;
@Produce("direct:ensureServerModeSendsProperly")
private ProducerTemplate serverProducer;
+ @Override
+ public void beforeEach(ExtensionContext context) throws Exception {
+ super.beforeEach(context);
+ testMethodName = context.getRequiredTestMethod().getName();
+ }
+
@Test
public void ensureServerModeSendsProperly() throws Exception {
- final String body = getClass().getName() + "#" + testName.getMethodName();
+ final String body = getClass().getName() + "#" + testMethodName;
serverProducer.sendBody(body);
assertEquals(body, messages.poll(10, TimeUnit.SECONDS));
}
@@ -63,7 +66,7 @@ public class JSR356ProducerTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:ensureServerModeSendsProperly").id("camel_consumer_acts_as_client").convertBodyTo(String.class)
- .to("websocket-jsr356://ws://localhost:" + servlet.getConfiguration().getHttpPort() + "/existingserver?sessionCount=5");
+ .to("websocket-jsr356://ws://localhost:" + configuration.getHttpPort() + "/existingserver?sessionCount=5");
}
};
}
diff --git a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/ServerEndpointDeploymentStrategyTest.java b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/ServerEndpointDeploymentStrategyTest.java
index cd0ca46..5ca6301 100644
--- a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/ServerEndpointDeploymentStrategyTest.java
+++ b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/ServerEndpointDeploymentStrategyTest.java
@@ -36,21 +36,19 @@ 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.apache.meecrowave.Meecrowave;
-import org.apache.meecrowave.junit.MeecrowaveRule;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.meecrowave.junit5.MeecrowaveConfig;
+import org.apache.meecrowave.testing.ConfigurationInject;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@MeecrowaveConfig(scanningPackageIncludes = "org.apache.camel.websocket.jsr356.ServerEndpointDeploymentStrategyTest$")
public class ServerEndpointDeploymentStrategyTest extends CamelTestSupport {
- @Rule
- public final MeecrowaveRule servlet = new MeecrowaveRule(new Meecrowave.Builder() {
- {
- randomHttpPort();
- setScanningPackageIncludes("org.apache.camel.websocket.jsr356.ServerEndpointDeploymentStrategyTest$");
- }
- }, "");
+ @ConfigurationInject
+ Meecrowave.Builder configuration;
@Test
public void customDeploymentStrategyTest() throws Exception {
@@ -111,7 +109,6 @@ public class ServerEndpointDeploymentStrategyTest extends CamelTestSupport {
}
private URI getEndpointURI(String path) throws URISyntaxException {
- Meecrowave.Builder configuration = servlet.getConfiguration();
return new URI(String.format("ws://%s:%d/%s", configuration.getHost(), configuration.getHttpPort(), path));
}
[camel] 04/27: [CAMEL-11807] Upgrade camel-soroush 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 420e581dd83c66060ed3809cf33ea3d96f2e1017
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jul 22 23:17:40 2020 +0200
[CAMEL-11807] Upgrade camel-soroush to junit5
---
components/camel-soroush/pom.xml | 2 +-
.../component/ConsumerAutoDownloadFileTest.java | 12 ++--
.../ConsumerAutoReconnectAfterIdleTimeoutTest.java | 2 +-
.../component/ConsumerCamelConcurrentTest.java | 13 ++--
...nsumerExceptionHandledWithErrorHandlerTest.java | 2 +-
.../component/ConsumerMultiThreadTest.java | 2 +-
.../component/ConsumerNativeConcurrentTest.java | 10 +--
.../ConsumerQueueCapacityPerThreadTest.java | 2 +-
.../ConsumerRetryOnConnectionFailureTest.java | 2 +-
.../soroushbot/component/ConsumerTest.java | 7 ++-
...onentialBackOffProducerConnectionRetryTest.java | 11 ++--
.../FixedBackOffProducerConnectionRetryTest.java | 11 ++--
.../HandleExceptionWithErrorHandlerTest.java | 7 ++-
.../LinearBackOffProducerConnectionRetryTest.java | 11 ++--
...etryWaitingTimeProducerConnectionRetryTest.java | 11 ++--
.../ProducerAutoUploadFileIsFalseTest.java | 18 +++---
.../component/ProducerAutoUploadFileTest.java | 21 ++++---
.../component/ProducerConnectionRetryTest.java | 11 ++--
.../component/ProducerDownloadFileTest.java | 17 ++---
.../ProducerDownloadFileWithoutThumbnailTest.java | 18 +++---
.../ProducerMaxConnectionRetryReachedTest.java | 14 +++--
.../soroushbot/component/ProducerTest.java | 11 ++--
.../component/ProducerUploadFileTest.java | 17 ++---
.../soroushbot/service/SoroushServiceTest.java | 32 ++++++----
.../soroushbot/support/SoroushBotTestSupport.java | 10 +--
.../utils/MultiQueueWithTopicThreadPoolTest.java | 72 ++++++++++++----------
26 files changed, 191 insertions(+), 155 deletions(-)
diff --git a/components/camel-soroush/pom.xml b/components/camel-soroush/pom.xml
index bb71b38..01f5d3a 100644
--- a/components/camel-soroush/pom.xml
+++ b/components/camel-soroush/pom.xml
@@ -81,7 +81,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-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoDownloadFileTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoDownloadFileTest.java
index 22f1079..449b3bf 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoDownloadFileTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoDownloadFileTest.java
@@ -25,8 +25,10 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
-import org.junit.Assert;
-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 ConsumerAutoDownloadFileTest extends SoroushBotTestSupport {
@Override
@@ -46,11 +48,11 @@ public class ConsumerAutoDownloadFileTest extends SoroushBotTestSupport {
mockEndpoint.setExpectedCount(4);
mockEndpoint.assertIsSatisfied();
List<Exchange> exchanges = mockEndpoint.getExchanges();
- Assert.assertEquals(exchanges.size(), 4);
+ assertEquals(exchanges.size(), 4);
exchanges.forEach(exchange -> {
SoroushMessage body = exchange.getIn().getBody(SoroushMessage.class);
- Assert.assertTrue("if fileUrl is not null file may not be null and visa versa", body.getFile() == null ^ body.getFileUrl() != null);
- Assert.assertTrue("if and only if thumbnail url is null thumbnail may be null", body.getThumbnail() == null ^ body.getThumbnailUrl() != null);
+ assertTrue(body.getFile() == null ^ body.getFileUrl() != null, "if fileUrl is not null file may not be null and visa versa");
+ assertTrue(body.getThumbnail() == null ^ body.getThumbnailUrl() != null, "if and only if thumbnail url is null thumbnail may be null");
});
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoReconnectAfterIdleTimeoutTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoReconnectAfterIdleTimeoutTest.java
index ac59869..23f4be7 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoReconnectAfterIdleTimeoutTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoReconnectAfterIdleTimeoutTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsumerAutoReconnectAfterIdleTimeoutTest extends SoroushBotTestSupport {
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerCamelConcurrentTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerCamelConcurrentTest.java
index af755c3..6092891 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerCamelConcurrentTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerCamelConcurrentTest.java
@@ -26,8 +26,9 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.logging.log4j.LogManager;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ConsumerCamelConcurrentTest extends SoroushBotTestSupport {
final List<String> fromOrder = new ArrayList<>();
@@ -59,9 +60,9 @@ public class ConsumerCamelConcurrentTest extends SoroushBotTestSupport {
mockEndpoint.expectedMessageCount(10);
mockEndpoint.assertIsSatisfied();
LogManager.getLogger().info(fromOrder.toString());
- Assert.assertEquals(fromOrder.size(), 10);
- Assert.assertEquals(fromOrder.get(7), "u0");
- Assert.assertEquals(fromOrder.get(8), "u0");
- Assert.assertEquals(fromOrder.get(9), "u0");
+ assertEquals(fromOrder.size(), 10);
+ assertEquals(fromOrder.get(7), "u0");
+ assertEquals(fromOrder.get(8), "u0");
+ assertEquals(fromOrder.get(9), "u0");
}
}
\ No newline at end of file
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerExceptionHandledWithErrorHandlerTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerExceptionHandledWithErrorHandlerTest.java
index 88319c8..6ee9fdd 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerExceptionHandledWithErrorHandlerTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerExceptionHandledWithErrorHandlerTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.utils.CongestionException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsumerExceptionHandledWithErrorHandlerTest extends SoroushBotTestSupport {
@Override
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerMultiThreadTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerMultiThreadTest.java
index f3aaf78..a57e184 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerMultiThreadTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerMultiThreadTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsumerMultiThreadTest extends SoroushBotTestSupport {
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerNativeConcurrentTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerNativeConcurrentTest.java
index e4f2249..6a8f29e 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerNativeConcurrentTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerNativeConcurrentTest.java
@@ -27,8 +27,10 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.logging.log4j.LogManager;
-import org.junit.Assert;
-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 ConsumerNativeConcurrentTest extends SoroushBotTestSupport {
ConcurrentHashMap<String, Thread> userToThread;
@@ -62,7 +64,7 @@ public class ConsumerNativeConcurrentTest extends SoroushBotTestSupport {
mockEndpoint.assertIsSatisfied();
LogManager.getLogger().info(userToThread.size());
LogManager.getLogger().info(userToThread.values());
- Assert.assertEquals("previous and current thread must be equal", badThread.get(), 0);
- Assert.assertTrue("there must be more than 1 thread in $userToThread unless this test is not useful", new HashSet(userToThread.values()).size() > 1);
+ assertEquals(badThread.get(), 0, "previous and current thread must be equal");
+ assertTrue(new HashSet<>(userToThread.values()).size() > 1, "there must be more than 1 thread in $userToThread unless this test is not useful");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerQueueCapacityPerThreadTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerQueueCapacityPerThreadTest.java
index d18acd1..5cadcd1 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerQueueCapacityPerThreadTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerQueueCapacityPerThreadTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsumerQueueCapacityPerThreadTest extends SoroushBotTestSupport {
@Override
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerRetryOnConnectionFailureTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerRetryOnConnectionFailureTest.java
index a511e67..31a5699 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerRetryOnConnectionFailureTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerRetryOnConnectionFailureTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsumerRetryOnConnectionFailureTest extends SoroushBotTestSupport {
@Override
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerTest.java
index bb543af..5e32763 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerTest.java
@@ -23,8 +23,9 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.logging.log4j.LogManager;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ConsumerTest extends SoroushBotTestSupport {
@@ -36,7 +37,7 @@ public class ConsumerTest extends SoroushBotTestSupport {
MockEndpoint mockEndpoint = getMockEndpoint("mock:generalTest");
mockEndpoint.setExpectedMessageCount(5);
mockEndpoint.assertIsSatisfied();
- Assert.assertEquals("total number of successful message is equal to 5", 5, successMessageCount);
+ assertEquals(5, successMessageCount, "total number of successful message is equal to 5");
}
@Override
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ExponentialBackOffProducerConnectionRetryTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ExponentialBackOffProducerConnectionRetryTest.java
index 698b26d..8fb0193 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ExponentialBackOffProducerConnectionRetryTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ExponentialBackOffProducerConnectionRetryTest.java
@@ -25,9 +25,10 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-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.assertEquals;
public class ExponentialBackOffProducerConnectionRetryTest extends SoroushBotTestSupport {
@@ -35,7 +36,7 @@ public class ExponentialBackOffProducerConnectionRetryTest extends SoroushBotTes
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -72,6 +73,6 @@ public class ExponentialBackOffProducerConnectionRetryTest extends SoroushBotTes
//cause this thread to sleep an addition of 1 second, during this time,the message must be sent to the server
afterAllRetry.setAssertPeriod(1000);
afterAllRetry.assertIsSatisfied();
- Assert.assertEquals("message sent successfully", SoroushBotWS.getReceivedMessages().get(0), body);
+ assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/FixedBackOffProducerConnectionRetryTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/FixedBackOffProducerConnectionRetryTest.java
index a34b376..17117c7 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/FixedBackOffProducerConnectionRetryTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/FixedBackOffProducerConnectionRetryTest.java
@@ -25,9 +25,10 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-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.assertEquals;
public class FixedBackOffProducerConnectionRetryTest extends SoroushBotTestSupport {
@@ -35,7 +36,7 @@ public class FixedBackOffProducerConnectionRetryTest extends SoroushBotTestSuppo
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -73,6 +74,6 @@ public class FixedBackOffProducerConnectionRetryTest extends SoroushBotTestSuppo
//cause this thread to sleep an addition of .6 second, during this time,the message must be sent to the server
afterAllRetry.setAssertPeriod(600);
afterAllRetry.assertIsSatisfied();
- Assert.assertEquals("message sent successfully", SoroushBotWS.getReceivedMessages().get(0), body);
+ assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/HandleExceptionWithErrorHandlerTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/HandleExceptionWithErrorHandlerTest.java
index bed3c81..d19979f 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/HandleExceptionWithErrorHandlerTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/HandleExceptionWithErrorHandlerTest.java
@@ -25,8 +25,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class HandleExceptionWithErrorHandlerTest extends SoroushBotTestSupport {
@Override
@@ -39,7 +40,7 @@ public class HandleExceptionWithErrorHandlerTest extends SoroushBotTestSupport {
.process(exchange -> {
SoroushMessage body = exchange.getIn().getBody(SoroushMessage.class);
File file = new File("badFile-ShouldNotExits");
- Assert.assertFalse("file should not exists for this test", file.exists());
+ assertFalse(file.exists(), "file should not exists for this test");
body.setFile(file);
body.setTo(body.getFrom());
})
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/LinearBackOffProducerConnectionRetryTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/LinearBackOffProducerConnectionRetryTest.java
index c932e4f..a26d905 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/LinearBackOffProducerConnectionRetryTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/LinearBackOffProducerConnectionRetryTest.java
@@ -25,9 +25,10 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-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.assertEquals;
public class LinearBackOffProducerConnectionRetryTest extends SoroushBotTestSupport {
@@ -35,7 +36,7 @@ public class LinearBackOffProducerConnectionRetryTest extends SoroushBotTestSupp
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -73,6 +74,6 @@ public class LinearBackOffProducerConnectionRetryTest extends SoroushBotTestSupp
//cause this thread to sleep an addition of 1 second, during this time,the message must be sent to the server
afterAllRetry.setAssertPeriod(2000);
afterAllRetry.assertIsSatisfied();
- Assert.assertEquals("message sent successfully", SoroushBotWS.getReceivedMessages().get(0), body);
+ assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/MaxRetryWaitingTimeProducerConnectionRetryTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/MaxRetryWaitingTimeProducerConnectionRetryTest.java
index 881c21e..807d7f4 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/MaxRetryWaitingTimeProducerConnectionRetryTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/MaxRetryWaitingTimeProducerConnectionRetryTest.java
@@ -25,9 +25,10 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-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.assertEquals;
public class MaxRetryWaitingTimeProducerConnectionRetryTest extends SoroushBotTestSupport {
@@ -35,7 +36,7 @@ public class MaxRetryWaitingTimeProducerConnectionRetryTest extends SoroushBotTe
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -72,6 +73,6 @@ public class MaxRetryWaitingTimeProducerConnectionRetryTest extends SoroushBotTe
//cause this thread to sleep an addition of 1 second, during this time,the message must be sent to the server
afterAllRetry.setAssertPeriod(1000);
afterAllRetry.assertIsSatisfied();
- Assert.assertEquals("message sent successfully", SoroushBotWS.getReceivedMessages().get(0), body);
+ assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileIsFalseTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileIsFalseTest.java
index 1765b38..6b8825f 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileIsFalseTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileIsFalseTest.java
@@ -28,9 +28,11 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ProducerAutoUploadFileIsFalseTest extends SoroushBotTestSupport {
@@ -38,7 +40,7 @@ public class ProducerAutoUploadFileIsFalseTest extends SoroushBotTestSupport {
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -78,11 +80,11 @@ public class ProducerAutoUploadFileIsFalseTest extends SoroushBotTestSupport {
MockEndpoint mockEndpoint = getMockEndpoint("mock:soroush");
mockEndpoint.setExpectedMessageCount(1);
mockEndpoint.assertIsSatisfied();
- Assert.assertEquals("message sent successfully", SoroushBotWS.getReceivedMessages().get(0), body);
+ assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully");
SoroushMessage mockedMessage = mockEndpoint.getExchanges().get(0).getIn().getBody(SoroushMessage.class);
Map<String, String> fileIdToContent = SoroushBotWS.getFileIdToContent();
- Assert.assertEquals("file uploaded successfully", fileIdToContent.size(), 0);
- Assert.assertEquals(mockedMessage.getFileUrl(), null);
- Assert.assertEquals(mockedMessage.getThumbnailUrl(), null);
+ assertEquals(fileIdToContent.size(), 0, "file uploaded successfully");
+ assertNull(mockedMessage.getFileUrl());
+ assertNull(mockedMessage.getThumbnailUrl());
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileTest.java
index 1fb9579..979a003 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileTest.java
@@ -28,19 +28,20 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-import org.junit.Assert;
-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;
-@Ignore("CAMEL-13629 failing test")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("CAMEL-13629 failing test")
public class ProducerAutoUploadFileTest extends SoroushBotTestSupport {
@EndpointInject("direct:soroush")
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -80,11 +81,11 @@ public class ProducerAutoUploadFileTest extends SoroushBotTestSupport {
MockEndpoint mockEndpoint = getMockEndpoint("mock:soroush");
mockEndpoint.setExpectedMessageCount(1);
mockEndpoint.assertIsSatisfied();
- Assert.assertEquals("message sent successfully", SoroushBotWS.getReceivedMessages().get(0), body);
+ assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully");
SoroushMessage mockedMessage = mockEndpoint.getExchanges().get(0).getIn().getBody(SoroushMessage.class);
Map<String, String> fileIdToContent = SoroushBotWS.getFileIdToContent();
- Assert.assertEquals("file uploaded successfully", fileIdToContent.size(), 2);
- Assert.assertEquals(fileIdToContent.get(mockedMessage.getFileUrl()), fileContent);
- Assert.assertEquals(fileIdToContent.get(mockedMessage.getThumbnailUrl()), thumbContent);
+ assertEquals(fileIdToContent.size(), 2, "file uploaded successfully");
+ assertEquals(fileIdToContent.get(mockedMessage.getFileUrl()), fileContent);
+ assertEquals(fileIdToContent.get(mockedMessage.getThumbnailUrl()), thumbContent);
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerConnectionRetryTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerConnectionRetryTest.java
index 13142fe..4fc88f2 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerConnectionRetryTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerConnectionRetryTest.java
@@ -25,9 +25,10 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-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.assertEquals;
public class ProducerConnectionRetryTest extends SoroushBotTestSupport {
@@ -35,7 +36,7 @@ public class ProducerConnectionRetryTest extends SoroushBotTestSupport {
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -62,6 +63,6 @@ public class ProducerConnectionRetryTest extends SoroushBotTestSupport {
MockEndpoint mockEndpoint = getMockEndpoint("mock:soroush");
mockEndpoint.setExpectedMessageCount(1);
mockEndpoint.assertIsSatisfied();
- Assert.assertEquals("message sent successfully", SoroushBotWS.getReceivedMessages().get(0), body);
+ assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerDownloadFileTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerDownloadFileTest.java
index e5bc412..a975ff2 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerDownloadFileTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerDownloadFileTest.java
@@ -30,12 +30,13 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-import org.junit.Assert;
-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;
-@Ignore("CAMEL-13629 failing test")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("CAMEL-13629 failing test")
public class ProducerDownloadFileTest extends SoroushBotTestSupport {
@EndpointInject("direct:soroush")
@@ -43,7 +44,7 @@ public class ProducerDownloadFileTest extends SoroushBotTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -81,8 +82,8 @@ public class ProducerDownloadFileTest extends SoroushBotTestSupport {
mockEndpoint.setExpectedMessageCount(1);
mockEndpoint.assertIsSatisfied();
SoroushMessage mockedMessage = mockEndpoint.getExchanges().get(0).getIn().getBody(SoroushMessage.class);
- Assert.assertEquals("download file successfully", new String(IOUtils.readFully(mockedMessage.getFile(), 1000, false)), fileContent);
- Assert.assertEquals("download thumbnail successfully", new String(IOUtils.readFully(mockedMessage.getThumbnail(), 1000, false)), thumbContent);
+ assertEquals(new String(IOUtils.readFully(mockedMessage.getFile(), 1000, false)), fileContent, "download file successfully");
+ assertEquals(new String(IOUtils.readFully(mockedMessage.getThumbnail(), 1000, false)), thumbContent, "download thumbnail successfully");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerDownloadFileWithoutThumbnailTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerDownloadFileWithoutThumbnailTest.java
index ae6cd86..4c03ec1 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerDownloadFileWithoutThumbnailTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerDownloadFileWithoutThumbnailTest.java
@@ -30,12 +30,14 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-import org.junit.Assert;
-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;
-@Ignore("CAMEL-13629 failing test")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@Disabled("CAMEL-13629 failing test")
public class ProducerDownloadFileWithoutThumbnailTest extends SoroushBotTestSupport {
@EndpointInject("direct:soroush")
@@ -43,7 +45,7 @@ public class ProducerDownloadFileWithoutThumbnailTest extends SoroushBotTestSupp
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -81,8 +83,8 @@ public class ProducerDownloadFileWithoutThumbnailTest extends SoroushBotTestSupp
mockEndpoint.setExpectedMessageCount(1);
mockEndpoint.assertIsSatisfied();
SoroushMessage mockedMessage = mockEndpoint.getExchanges().get(0).getIn().getBody(SoroushMessage.class);
- Assert.assertEquals("download file successfully", new String(IOUtils.readFully(mockedMessage.getFile(), 1000, false)), fileContent);
- Assert.assertEquals("download thumbnail successfully", mockedMessage.getThumbnail(), null);
+ assertEquals(new String(IOUtils.readFully(mockedMessage.getFile(), 1000, false)), fileContent, "download file successfully");
+ assertNull(mockedMessage.getThumbnail(), "download thumbnail successfully");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerMaxConnectionRetryReachedTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerMaxConnectionRetryReachedTest.java
index 1248568..bf84947 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerMaxConnectionRetryReachedTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerMaxConnectionRetryReachedTest.java
@@ -26,9 +26,11 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ProducerMaxConnectionRetryReachedTest extends SoroushBotTestSupport {
@@ -36,7 +38,7 @@ public class ProducerMaxConnectionRetryReachedTest extends SoroushBotTestSupport
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -65,11 +67,11 @@ public class ProducerMaxConnectionRetryReachedTest extends SoroushBotTestSupport
} catch (CamelExecutionException ex) {
exceptionOccur = true;
}
- Assert.assertTrue("an exception happend due to maximumConnetion try reached!", exceptionOccur);
+ assertTrue(exceptionOccur, "an exception happend due to maximumConnetion try reached!");
MockEndpoint mockEndpoint = getMockEndpoint("mock:soroush");
mockEndpoint.setAssertPeriod(1000);
mockEndpoint.setExpectedMessageCount(0);
mockEndpoint.assertIsSatisfied();
- Assert.assertEquals("message did not send", SoroushBotWS.getReceivedMessages().size(), 0);
+ assertEquals(SoroushBotWS.getReceivedMessages().size(), 0, "message did not send");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerTest.java
index 76fd000..0cf8cb6 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerTest.java
@@ -25,9 +25,10 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-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.assertEquals;
public class ProducerTest extends SoroushBotTestSupport {
@@ -35,7 +36,7 @@ public class ProducerTest extends SoroushBotTestSupport {
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -62,6 +63,6 @@ public class ProducerTest extends SoroushBotTestSupport {
MockEndpoint mockEndpoint = getMockEndpoint("mock:soroush");
mockEndpoint.setExpectedMessageCount(1);
mockEndpoint.assertIsSatisfied();
- Assert.assertEquals("message sent successfully", SoroushBotWS.getReceivedMessages().get(0), body);
+ assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerUploadFileTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerUploadFileTest.java
index 0c7a51b..e6a2d76 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerUploadFileTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerUploadFileTest.java
@@ -28,9 +28,10 @@ import org.apache.camel.component.soroushbot.models.SoroushAction;
import org.apache.camel.component.soroushbot.models.SoroushMessage;
import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport;
import org.apache.camel.component.soroushbot.support.SoroushBotWS;
-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.assertEquals;
public class ProducerUploadFileTest extends SoroushBotTestSupport {
@@ -38,7 +39,7 @@ public class ProducerUploadFileTest extends SoroushBotTestSupport {
org.apache.camel.Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
SoroushBotWS.clear();
@@ -78,12 +79,12 @@ public class ProducerUploadFileTest extends SoroushBotTestSupport {
MockEndpoint mockEndpoint = getMockEndpoint("mock:soroush");
mockEndpoint.setExpectedMessageCount(1);
mockEndpoint.assertIsSatisfied();
- Assert.assertEquals("no message sent.", SoroushBotWS.getReceivedMessages().size(), 0);
+ assertEquals(SoroushBotWS.getReceivedMessages().size(), 0, "no message sent.");
SoroushMessage mockedMessage = mockEndpoint.getExchanges().get(0).getIn().getBody(SoroushMessage.class);
Map<String, String> fileIdToContent = SoroushBotWS.getFileIdToContent();
- Assert.assertEquals("file uploaded successfully", fileIdToContent.size(), 2);
- Assert.assertEquals(fileIdToContent.get(mockedMessage.getFileUrl()), fileContent);
- Assert.assertEquals(fileIdToContent.get(mockedMessage.getThumbnailUrl()), thumbContent);
+ assertEquals(fileIdToContent.size(), 2, "file uploaded successfully");
+ assertEquals(fileIdToContent.get(mockedMessage.getFileUrl()), fileContent);
+ assertEquals(fileIdToContent.get(mockedMessage.getThumbnailUrl()), thumbContent);
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/service/SoroushServiceTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/service/SoroushServiceTest.java
index da85b68..9ddad57 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/service/SoroushServiceTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/service/SoroushServiceTest.java
@@ -39,26 +39,32 @@ import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart;
import org.glassfish.jersey.media.sse.EventInput;
import org.glassfish.jersey.media.sse.InboundEvent;
import org.glassfish.jersey.media.sse.SseFeature;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+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.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;
/**
* check if soroush BOT Api work as expected
*/
-@Ignore("Need the token to work")
+@Disabled("Need the token to work")
public class SoroushServiceTest {
static String authorizationToken;
static String receiverId;
private static SoroushService soroushService;
- @BeforeClass
+ @BeforeAll
public static void setUp() {
authorizationToken = System.getenv("soroushBotAuthorizationToken");
receiverId = System.getenv("soroushBotReceiverId");
- Assert.assertTrue("you need to define `soroushBotAuthorizationToken` and "
- + "`soroushBotReceiverId` environment variable in order to do integration test ", authorizationToken != null && receiverId != null);
+ assertTrue(authorizationToken != null && receiverId != null,
+ "you need to define `soroushBotAuthorizationToken` and "
+ + "`soroushBotReceiverId` environment variable in order to do integration test ");
soroushService = SoroushService.get();
soroushService.setAlternativeUrl(null);
}
@@ -73,7 +79,7 @@ public class SoroushServiceTest {
WebTarget target = client.target(soroushService.generateUrl(authorizationToken, SoroushAction.getMessage, null));
EventInput eventInput = target.request().get(EventInput.class);
eventInput.setChunkType(MediaType.SERVER_SENT_EVENTS);
- Assert.assertFalse(eventInput.isClosed());
+ assertFalse(eventInput.isClosed());
}
@Test
@@ -83,9 +89,9 @@ public class SoroushServiceTest {
WebTarget target = client.target(soroushService.generateUrl("bad_string" + authorizationToken, SoroushAction.getMessage, null));
EventInput eventInput = target.request().get(EventInput.class);
eventInput.setChunkType(MediaType.SERVER_SENT_EVENTS);
- Assert.assertFalse(eventInput.isClosed());
+ assertFalse(eventInput.isClosed());
InboundEvent read = eventInput.read();
- Assert.assertNull(read);
+ assertNull(read);
}
@Test
@@ -110,12 +116,12 @@ public class SoroushServiceTest {
Response response = target.request(MediaType.APPLICATION_JSON_TYPE)
.post(Entity.entity(multipart, multipart.getMediaType()));
UploadFileResponse uploadFileResponse = soroushService.assertSuccessful(response, UploadFileResponse.class, null);
- Assert.assertNotNull(uploadFileResponse.getFileUrl());
+ assertNotNull(uploadFileResponse.getFileUrl());
WebTarget downloadFileTarget = soroushService.createDownloadFileTarget(authorizationToken, uploadFileResponse.getFileUrl(), 2000);
Response downloadResponse = downloadFileTarget.request().get();
String remoteData = new String(IOUtils.readFully(downloadResponse.readEntity(InputStream.class), -1, false));
- Assert.assertEquals("file contents are identical", fileData, remoteData);
+ assertEquals(fileData, remoteData, "file contents are identical");
}
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/support/SoroushBotTestSupport.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/support/SoroushBotTestSupport.java
index 9a63844..7677876 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/support/SoroushBotTestSupport.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/support/SoroushBotTestSupport.java
@@ -18,10 +18,10 @@
package org.apache.camel.component.soroushbot.support;
import org.apache.camel.component.soroushbot.service.SoroushService;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.logging.log4j.LogManager;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
/**
* A support test class for Soroush Bot tests.
@@ -30,7 +30,7 @@ public class SoroushBotTestSupport extends CamelTestSupport {
private static SoroushMockServer soroushMockServer;
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
if (soroushMockServer == null) {
soroushMockServer = new SoroushMockServer();
@@ -41,7 +41,7 @@ public class SoroushBotTestSupport extends CamelTestSupport {
LogManager.getLogger().info("soroushMockServer is up on port " + port);
}
- @AfterClass
+ @AfterAll
public static void afterClass() {
SoroushService.get().setAlternativeUrl(null);
}
diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/utils/MultiQueueWithTopicThreadPoolTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/utils/MultiQueueWithTopicThreadPoolTest.java
index 7e773bc..2152407 100644
--- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/utils/MultiQueueWithTopicThreadPoolTest.java
+++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/utils/MultiQueueWithTopicThreadPoolTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.soroushbot.utils;
import java.util.concurrent.LinkedBlockingQueue;
-import org.junit.Assert;
-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.assertThrows;
public class MultiQueueWithTopicThreadPoolTest {
@Test
@@ -43,22 +45,24 @@ public class MultiQueueWithTopicThreadPoolTest {
});
}
Thread.sleep(capacity * (capacity + 2) * 100 / 2); // wait enough time for all task to be done
- Assert.assertArrayEquals("order of thread that executed is not what is expected", results, finalResultsOrder.toArray());
+ assertArrayEquals(results, finalResultsOrder.toArray(), "order of thread that executed is not what is expected");
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void singleThreadPoolSizeExceeded() {
- int capacity = 10;
- MultiQueueWithTopicThreadPool pool = new MultiQueueWithTopicThreadPool(1, capacity, "test");
- for (int i = 0; i < capacity + 2; i++) {
- pool.execute(i % 3, () -> {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- });
- }
+ assertThrows(IllegalStateException.class, () -> {
+ int capacity = 10;
+ MultiQueueWithTopicThreadPool pool = new MultiQueueWithTopicThreadPool(1, capacity, "test");
+ for (int i = 0; i < capacity + 2; i++) {
+ pool.execute(i % 3, () -> {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ });
+ }
+ });
}
@Test
@@ -89,7 +93,8 @@ public class MultiQueueWithTopicThreadPoolTest {
});
}
Thread.sleep(130 * 3 + 500); // wait enough time for all task to be done
- Assert.assertArrayEquals("order of thread that executed is not what is expected", results, finalResultsOrder.toArray());
+ assertArrayEquals(results, finalResultsOrder.toArray(),
+ "order of thread that executed is not what is expected");
}
@Test
@@ -120,24 +125,27 @@ public class MultiQueueWithTopicThreadPoolTest {
Object[] finalResultsOrderList = finalResultsOrder.toArray();
//order of first three job is not fully determined so we set them to null
finalResultsOrderList[0] = finalResultsOrderList[1] = finalResultsOrderList[2] = null;
- Assert.assertArrayEquals("order of thread that executed is not what is expected", expectedResults, finalResultsOrderList);
+ assertArrayEquals(expectedResults, finalResultsOrderList,
+ "order of thread that executed is not what is expected");
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void multiThreadPoolSizeExceeded() throws InterruptedException {
- LinkedBlockingQueue<Integer> finalResultsOrder = new LinkedBlockingQueue<>();
- int capacity = 3;
- int poolSize = 3;
- MultiQueueWithTopicThreadPool pool = new MultiQueueWithTopicThreadPool(poolSize, capacity, "test");
- for (int i = 0; i < (capacity + 1) * poolSize + 1; i++) {
- pool.execute(i % poolSize, () -> {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- });
- }
- Thread.sleep(100);
+ assertThrows(IllegalStateException.class, () -> {
+ LinkedBlockingQueue<Integer> finalResultsOrder = new LinkedBlockingQueue<>();
+ int capacity = 3;
+ int poolSize = 3;
+ MultiQueueWithTopicThreadPool pool = new MultiQueueWithTopicThreadPool(poolSize, capacity, "test");
+ for (int i = 0; i < (capacity + 1) * poolSize + 1; i++) {
+ pool.execute(i % poolSize, () -> {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ });
+ }
+ Thread.sleep(100);
+ });
}
}
[camel] 27/27: [CAMEL-11807] Upgrade camel-wordpress 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 f664787a5bc2398e28714c5e91b76a0a98ff6be0
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 16:25:52 2020 +0200
[CAMEL-11807] Upgrade camel-wordpress to junit5
---
components/camel-wordpress/pom.xml | 2 +-
.../camel/component/wordpress/WordpressComponentTest.java | 6 ++++--
.../wordpress/WordpressComponentTestSupport.java | 10 +++++-----
.../component/wordpress/WordpressPostOperationTest.java | 3 ++-
.../component/wordpress/WordpressUserOperationTest.java | 3 ++-
.../wordpress/api/model/PublishableStatusTest.java | 15 +++++++++------
.../service/impl/WordpressServicePostsAdapterTest.java | 8 ++++----
.../service/impl/WordpressServiceUsersAdapterTest.java | 8 ++++----
.../impl/ignored/WordpressServiceCategoriesAdapterIT.java | 12 ++++++------
.../impl/ignored/WordpressServiceCommentsAdapterIT.java | 12 ++++++------
.../impl/ignored/WordpressServicePagesAdapterIT.java | 12 ++++++------
.../ignored/WordpressServicePostRevisionAdapterIT.java | 12 ++++++------
.../impl/ignored/WordpressServiceTagsAdapterIT.java | 12 ++++++------
.../impl/ignored/WordpressServiceTaxonomyAdapterIT.java | 12 ++++++------
.../api/test/WordpressMockServerTestSupport.java | 8 ++++----
15 files changed, 71 insertions(+), 64 deletions(-)
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index d88d1f9..1151fca 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -55,7 +55,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-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java
index ac3e69b..247471e 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java
@@ -18,16 +18,18 @@ package org.apache.camel.component.wordpress;
import org.apache.camel.component.wordpress.api.model.PostOrderBy;
import org.apache.camel.component.wordpress.api.model.PostSearchCriteria;
-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.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.Matchers.not;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class WordpressComponentTest extends CamelTestSupport {
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTestSupport.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTestSupport.java
index 19ada74..04339b6 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTestSupport.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTestSupport.java
@@ -19,18 +19,18 @@ package org.apache.camel.component.wordpress;
import java.io.IOException;
import org.apache.camel.component.wordpress.api.test.WordpressMockServerTestSupport;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class WordpressComponentTestSupport extends CamelTestSupport {
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
WordpressMockServerTestSupport.setUpMockServer();
}
- @AfterClass
+ @AfterAll
public static void afterClass() {
WordpressMockServerTestSupport.tearDownMockServer();
}
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressPostOperationTest.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressPostOperationTest.java
index c22035d..133d231 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressPostOperationTest.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressPostOperationTest.java
@@ -22,9 +22,10 @@ import org.apache.camel.component.wordpress.api.WordpressConstants;
import org.apache.camel.component.wordpress.api.model.Content;
import org.apache.camel.component.wordpress.api.model.Post;
import org.apache.camel.component.wordpress.api.model.PublishableStatus;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class WordpressPostOperationTest extends WordpressComponentTestSupport {
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressUserOperationTest.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressUserOperationTest.java
index c1dc312..a830324 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressUserOperationTest.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressUserOperationTest.java
@@ -19,9 +19,10 @@ package org.apache.camel.component.wordpress;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.wordpress.api.model.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class WordpressUserOperationTest extends WordpressComponentTestSupport {
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/model/PublishableStatusTest.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/model/PublishableStatusTest.java
index a41193b..7fc9a6e 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/model/PublishableStatusTest.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/model/PublishableStatusTest.java
@@ -16,10 +16,11 @@
*/
package org.apache.camel.component.wordpress.api.model;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class PublishableStatusTest {
@@ -32,18 +33,20 @@ public class PublishableStatusTest {
assertThat(PublishableStatus.fromString(input2), is(PublishableStatus.private_));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testFromStringEmpty() {
final String input3 = "";
- assertThat(PublishableStatus.fromString(input3), is(PublishableStatus.private_));
+ assertThrows(IllegalArgumentException.class,
+ () -> PublishableStatus.fromString(input3));
}
- @Test(expected = NullPointerException.class)
+ @Test
public void testFromStringNull() {
final String input4 = null;
- assertThat(PublishableStatus.fromString(input4), is(PublishableStatus.private_));
+ assertThrows(NullPointerException.class,
+ () -> PublishableStatus.fromString(input4));
}
}
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapterTest.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapterTest.java
index 23699a3..86dc40e 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapterTest.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapterTest.java
@@ -26,21 +26,21 @@ import org.apache.camel.component.wordpress.api.model.PostSearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressServicePosts;
import org.apache.camel.component.wordpress.api.test.WordpressMockServerTestSupport;
import org.apache.camel.component.wordpress.api.test.WordpressServerHttpRequestHandler;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertThat;
public class WordpressServicePostsAdapterTest extends WordpressMockServerTestSupport {
private static WordpressServicePosts servicePosts;
- @BeforeClass
+ @BeforeAll
public static void before() {
servicePosts = serviceProvider.getService(WordpressServicePosts.class);
servicePosts.setWordpressAuthentication(new WordpressBasicAuthentication(WordpressServerHttpRequestHandler.USERNAME, WordpressServerHttpRequestHandler.PASSWORD));
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceUsersAdapterTest.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceUsersAdapterTest.java
index 9256db7..6a29dba 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceUsersAdapterTest.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceUsersAdapterTest.java
@@ -24,21 +24,21 @@ import org.apache.camel.component.wordpress.api.model.UserSearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressServiceUsers;
import org.apache.camel.component.wordpress.api.test.WordpressMockServerTestSupport;
import org.apache.camel.component.wordpress.api.test.WordpressServerHttpRequestHandler;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertThat;
public class WordpressServiceUsersAdapterTest extends WordpressMockServerTestSupport {
private static WordpressServiceUsers serviceUsers;
- @BeforeClass
+ @BeforeAll
public static void before() {
serviceUsers = serviceProvider.getService(WordpressServiceUsers.class);
serviceUsers.setWordpressAuthentication(new WordpressBasicAuthentication(WordpressServerHttpRequestHandler.USERNAME, WordpressServerHttpRequestHandler.PASSWORD));
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceCategoriesAdapterIT.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceCategoriesAdapterIT.java
index 6712a99..aa0b191 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceCategoriesAdapterIT.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceCategoriesAdapterIT.java
@@ -23,23 +23,23 @@ import org.apache.camel.component.wordpress.api.WordpressServiceProvider;
import org.apache.camel.component.wordpress.api.model.Category;
import org.apache.camel.component.wordpress.api.model.CategorySearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressServiceCategories;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.junit.Assert.assertThat;
-@Ignore("Not implemented yet")
+@Disabled("Not implemented yet")
public class WordpressServiceCategoriesAdapterIT {
private static WordpressServiceCategories serviceCategories;
- @BeforeClass
+ @BeforeAll
public static void before() {
final WordpressServiceProvider serviceProvider = WordpressServiceProvider.getInstance();
serviceProvider.init(WordpressTestConstants.WORDPRESS_DEMO_URL);
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceCommentsAdapterIT.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceCommentsAdapterIT.java
index 624ca5d..5195f37 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceCommentsAdapterIT.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceCommentsAdapterIT.java
@@ -23,23 +23,23 @@ import org.apache.camel.component.wordpress.api.WordpressServiceProvider;
import org.apache.camel.component.wordpress.api.model.Category;
import org.apache.camel.component.wordpress.api.model.CategorySearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressServiceCategories;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.junit.Assert.assertThat;
-@Ignore("Not implemented yet")
+@Disabled("Not implemented yet")
public class WordpressServiceCommentsAdapterIT {
private static WordpressServiceCategories serviceCategories;
- @BeforeClass
+ @BeforeAll
public static void before() {
final WordpressServiceProvider serviceProvider = WordpressServiceProvider.getInstance();
serviceProvider.init(WordpressTestConstants.WORDPRESS_DEMO_URL);
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServicePagesAdapterIT.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServicePagesAdapterIT.java
index 7db06a7..407d06e 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServicePagesAdapterIT.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServicePagesAdapterIT.java
@@ -23,22 +23,22 @@ import org.apache.camel.component.wordpress.api.WordpressServiceProvider;
import org.apache.camel.component.wordpress.api.model.Page;
import org.apache.camel.component.wordpress.api.model.PageSearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressServicePages;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyCollectionOf;
-import static org.junit.Assert.assertThat;
-@Ignore("Not implemented yet")
+@Disabled("Not implemented yet")
public class WordpressServicePagesAdapterIT {
private static WordpressServicePages servicePages;
- @BeforeClass
+ @BeforeAll
public static void before() {
final WordpressServiceProvider serviceProvider = WordpressServiceProvider.getInstance();
serviceProvider.init(WordpressTestConstants.WORDPRESS_DEMO_URL);
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServicePostRevisionAdapterIT.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServicePostRevisionAdapterIT.java
index e979a59..8663da0 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServicePostRevisionAdapterIT.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServicePostRevisionAdapterIT.java
@@ -27,28 +27,28 @@ import org.apache.camel.component.wordpress.api.auth.WordpressBasicAuthenticatio
import org.apache.camel.component.wordpress.api.model.PostRevision;
import org.apache.camel.component.wordpress.api.service.WordpressServicePostRevision;
import org.apache.camel.component.wordpress.api.test.WordpressMockServerTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertThat;
/*
* TODO fix authentication problem (when implementing global authentication)
* javax.ws.rs.NotAuthorizedException: HTTP 401 Unauthorized
*/
-@Ignore("Not implemented yet")
+@Disabled("Not implemented yet")
public class WordpressServicePostRevisionAdapterIT extends WordpressMockServerTestSupport {
private static WordpressServicePostRevision servicePostRevision;
- @BeforeClass
+ @BeforeAll
public static void before() {
final WordpressServiceProvider serviceProvider = WordpressServiceProvider.getInstance();
final WordpressAuthentication authentication = new WordpressBasicAuthentication("integration_test", "JD)e)Ox)z@HyDF*Dv4aWszm*");
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTagsAdapterIT.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTagsAdapterIT.java
index 33301c8..346865b 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTagsAdapterIT.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTagsAdapterIT.java
@@ -23,23 +23,23 @@ import org.apache.camel.component.wordpress.api.WordpressServiceProvider;
import org.apache.camel.component.wordpress.api.model.Tag;
import org.apache.camel.component.wordpress.api.model.TagSearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressServiceTags;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyCollectionOf;
import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.junit.Assert.assertThat;
-@Ignore("Not implemented yet")
+@Disabled("Not implemented yet")
public class WordpressServiceTagsAdapterIT {
private static WordpressServiceTags serviceTags;
- @BeforeClass
+ @BeforeAll
public static void before() {
final WordpressServiceProvider serviceProvider = WordpressServiceProvider.getInstance();
serviceProvider.init(WordpressTestConstants.WORDPRESS_DEMO_URL);
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTaxonomyAdapterIT.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTaxonomyAdapterIT.java
index 72d7a25..02e667d 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTaxonomyAdapterIT.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTaxonomyAdapterIT.java
@@ -22,22 +22,22 @@ import org.apache.camel.component.wordpress.WordpressTestConstants;
import org.apache.camel.component.wordpress.api.WordpressServiceProvider;
import org.apache.camel.component.wordpress.api.model.Taxonomy;
import org.apache.camel.component.wordpress.api.service.WordpressServiceTaxonomy;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.junit.Assert.assertThat;
-@Ignore("Not implemented yet")
+@Disabled("Not implemented yet")
public class WordpressServiceTaxonomyAdapterIT {
private static WordpressServiceTaxonomy serviceTaxonomy;
- @BeforeClass
+ @BeforeAll
public static void before() {
final WordpressServiceProvider serviceProvider = WordpressServiceProvider.getInstance();
serviceProvider.init(WordpressTestConstants.WORDPRESS_DEMO_URL);
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/test/WordpressMockServerTestSupport.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/test/WordpressMockServerTestSupport.java
index c26f22c..711019d 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/test/WordpressMockServerTestSupport.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/test/WordpressMockServerTestSupport.java
@@ -24,8 +24,8 @@ import java.util.Map;
import org.apache.camel.component.wordpress.api.WordpressServiceProvider;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@ public abstract class WordpressMockServerTestSupport {
}
- @BeforeClass
+ @BeforeAll
public static void setUpMockServer() throws IOException {
// @formatter:off
int i = 0;
@@ -89,7 +89,7 @@ public abstract class WordpressMockServerTestSupport {
// @formatter:on
}
- @AfterClass
+ @AfterAll
public static void tearDownMockServer() {
LOGGER.info("Stopping local server");
if (localServer != null) {
[camel] 01/27: [CAMEL-11807] Upgrade camel-snmp 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 36943e4d5415c6909d998566573239399b06fead
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jul 22 22:17:01 2020 +0200
[CAMEL-11807] Upgrade camel-snmp to junit5
---
components/camel-snmp/pom.xml | 6 +++---
.../java/org/apache/camel/component/snmp/PollOIDTest.java | 8 ++++----
.../java/org/apache/camel/component/snmp/ProducerTest.java | 8 ++++----
.../java/org/apache/camel/component/snmp/TrapTest.java | 9 +++++----
.../apache/camel/component/snmp/UriConfigurationTest.java | 14 ++++++++------
.../java/org/apache/camel/component/snmp/WalkOIDTest.java | 8 ++++----
6 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/components/camel-snmp/pom.xml b/components/camel-snmp/pom.xml
index 249ead5..b0f32ca 100644
--- a/components/camel-snmp/pom.xml
+++ b/components/camel-snmp/pom.xml
@@ -48,13 +48,13 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<optional>true</optional>
<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-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
index 5419d3f..a067df7 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
@@ -21,9 +21,9 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,7 +32,7 @@ public class PollOIDTest extends CamelTestSupport {
// a disabled test... before enabling you must fill in a working IP, Port
// and maybe oids in the route below
- @Ignore
+ @Disabled
@Test
public void testOIDPolling() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java
index 5bbfa39..fe42aba 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java
@@ -20,11 +20,11 @@ import java.util.concurrent.TimeUnit;
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;
-@Ignore("CAMEL-10319: Set host, port and oids to test snmp producer.")
+@Disabled("CAMEL-10319: Set host, port and oids to test snmp producer.")
public class ProducerTest extends CamelTestSupport {
private String host = "192.168.0.254";
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
index fc75812..4bef612 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
@@ -26,9 +26,8 @@ import org.apache.camel.Producer;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.snmp4j.PDU;
@@ -39,6 +38,8 @@ import org.snmp4j.smi.TimeTicks;
import org.snmp4j.smi.Variable;
import org.snmp4j.smi.VariableBinding;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This test covers both producing and consuming snmp traps
*/
@@ -85,7 +86,7 @@ public class TrapTest extends CamelTestSupport {
List<Exchange> exchanges = mock.getExchanges();
SnmpMessage msg = (SnmpMessage) exchanges.get(0).getIn();
PDU receivedTrap = msg.getSnmpMessage();
- Assert.assertEquals(trap, receivedTrap);
+ assertEquals(trap, receivedTrap);
if (LOG.isInfoEnabled()) {
LOG.info("Received SNMP TRAP:");
Vector<? extends VariableBinding> variableBindings = receivedTrap.getVariableBindings();
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
index 6de7aef..12f7f6b 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.snmp;
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
@@ -30,7 +32,7 @@ public class UriConfigurationTest extends Assert {
context.start();
Endpoint endpoint = context.getEndpoint("snmp:0.0.0.0:1662?protocol=udp&type=TRAP&oids=1.3.6.1.2.1.7.5.1");
- assertTrue("Endpoint not an SnmpEndpoint: " + endpoint, endpoint instanceof SnmpEndpoint);
+ assertTrue(endpoint instanceof SnmpEndpoint, "Endpoint not an SnmpEndpoint: " + endpoint);
SnmpEndpoint snmpEndpoint = (SnmpEndpoint) endpoint;
assertEquals(SnmpActionType.TRAP, snmpEndpoint.getType());
@@ -43,7 +45,7 @@ public class UriConfigurationTest extends Assert {
context.start();
Endpoint endpoint = context.getEndpoint("snmp:0.0.0.0?protocol=udp&type=TRAP&oids=1.3.6.1.2.1.7.5.1");
- assertTrue("Endpoint not an SnmpEndpoint: " + endpoint, endpoint instanceof SnmpEndpoint);
+ assertTrue(endpoint instanceof SnmpEndpoint, "Endpoint not an SnmpEndpoint: " + endpoint);
SnmpEndpoint snmpEndpoint = (SnmpEndpoint) endpoint;
assertEquals(SnmpActionType.TRAP, snmpEndpoint.getType());
@@ -56,7 +58,7 @@ public class UriConfigurationTest extends Assert {
context.start();
Endpoint endpoint = context.getEndpoint("snmp:127.0.0.1:1662?protocol=udp&type=POLL&oids=1.3.6.1.2.1.7.5.1");
- assertTrue("Endpoint not an SnmpEndpoint: " + endpoint, endpoint instanceof SnmpEndpoint);
+ assertTrue(endpoint instanceof SnmpEndpoint, "Endpoint not an SnmpEndpoint: " + endpoint);
SnmpEndpoint snmpEndpoint = (SnmpEndpoint) endpoint;
assertEquals(SnmpActionType.POLL, snmpEndpoint.getType());
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/WalkOIDTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/WalkOIDTest.java
index 31c0273..92b2727 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/WalkOIDTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/WalkOIDTest.java
@@ -21,9 +21,9 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,7 +32,7 @@ public class WalkOIDTest extends CamelTestSupport {
// a disabled test... before enabling you must fill in a working IP, Port
// and maybe oids in the route below
- @Ignore
+ @Disabled
@Test
public void testOIDWalk() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
[camel] 05/27: [CAMEL-11807] Upgrade camel-spark 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 9e8b39707ab670a55d3f4df4aed88283c8db1cc8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 10:28:18 2020 +0200
[CAMEL-11807] Upgrade camel-spark to junit5
---
components/camel-spark/pom.xml | 6 +++---
.../org/apache/camel/component/spark/SparkProducerTest.java | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 467c467..9e8aea1 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -186,12 +186,12 @@
</dependency>
<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>
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
index 6c960d2..6b0ad73 100644
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
+++ b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.camel.component.spark.annotations.RddCallback;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaRDDLike;
import org.apache.spark.api.java.JavaSparkContext;
@@ -31,8 +31,8 @@ import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
import org.apache.spark.sql.hive.HiveContext;
import org.assertj.core.api.Assertions;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import static java.lang.Boolean.parseBoolean;
import static java.util.Arrays.asList;
@@ -40,7 +40,7 @@ import static org.apache.camel.component.spark.SparkConstants.SPARK_DATAFRAME_CA
import static org.apache.camel.component.spark.SparkConstants.SPARK_RDD_CALLBACK_HEADER;
import static org.apache.camel.component.spark.Sparks.createLocalSparkContext;
import static org.apache.camel.component.spark.annotations.AnnotatedRddCallback.annotatedRddCallback;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
public class SparkProducerTest extends CamelTestSupport {
@@ -60,7 +60,7 @@ public class SparkProducerTest extends CamelTestSupport {
int numberOfLinesInTestFile = 19;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
if (shouldRunHive) {
hiveContext = new HiveContext(sparkContext.sc());
[camel] 15/27: [CAMEL-11807] Upgrade camel-tagsoup 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 0753aeaf9e5629cad84906054eff32000f3e2c3a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 11:49:34 2020 +0200
[CAMEL-11807] Upgrade camel-tagsoup to junit5
---
components/camel-tagsoup/pom.xml | 6 +++---
.../tagsoup/TidyMarkupDataFormatAsDomNodeTest.java | 18 +++++++++++++-----
.../tagsoup/TidyMarkupDataFormatAsStringTest.java | 15 +++++++++++----
.../dataformat/tagsoup/TidyMarkupTestSupport.java | 9 ---------
4 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/components/camel-tagsoup/pom.xml b/components/camel-tagsoup/pom.xml
index 010c3ef..6bfbc87 100644
--- a/components/camel-tagsoup/pom.xml
+++ b/components/camel-tagsoup/pom.xml
@@ -52,7 +52,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -61,8 +61,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-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
index 06aa8ae..ad47e52 100644
--- a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
+++ b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
@@ -23,11 +23,19 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class TidyMarkupDataFormatAsDomNodeTest extends CamelTestSupport {
-
+
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
@Test
public void testUnMarshalToStringOfXml() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
@@ -53,14 +61,14 @@ public class TidyMarkupDataFormatAsDomNodeTest extends CamelTestSupport {
String response = in.getBody(String.class);
log.debug("Received " + response);
- assertNotNull("Should be able to convert received body to a string", response);
+ assertNotNull(response, "Should be able to convert received body to a string");
try {
/*
* our route xpaths the existence of our signature "<p>TidyMarkupNode"
* but of course, by the xpath time, it is well formed
*/
- assertTrue(response.equals("true"));
+ assertEquals("true", response);
} catch (Exception e) {
fail("Failed to convert the resulting String to XML: " + e.getLocalizedMessage());
diff --git a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
index 4d96509..84cbf5a 100644
--- a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
+++ b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
@@ -25,11 +25,18 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class TidyMarkupDataFormatAsStringTest extends CamelTestSupport {
-
+
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
@Test
public void testUnMarshalToStringOfXml() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
@@ -51,7 +58,7 @@ public class TidyMarkupDataFormatAsStringTest extends CamelTestSupport {
Node tidyMarkup = in.getBody(Node.class);
log.debug("Received " + tidyMarkup);
- assertNotNull("Should be able to convert received body to a string", tidyMarkup);
+ assertNotNull(tidyMarkup, "Should be able to convert received body to a string");
} catch (Exception e) {
fail("Failed to convert the resulting String to XML: " + e.getLocalizedMessage());
diff --git a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
index 2b53585..affc30c 100644
--- a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
+++ b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
@@ -56,12 +56,6 @@ public final class TidyMarkupTestSupport {
/**
* Convert XML String to a Document.
- *
- * @param xmlString
- * @return document Document
- * @throws IOException
- * @throws SAXException
- * @throws ParserConfigurationException
*/
public static Document stringToXml(String xmlString) throws SAXException, IOException, ParserConfigurationException {
return createDocumentBuilder().parse(new InputSource(new StringReader(xmlString)));
@@ -69,9 +63,6 @@ public final class TidyMarkupTestSupport {
/**
* Static to generate a documentBuilder
- *
- * @return
- * @throws ParserConfigurationException
*/
public static DocumentBuilder createDocumentBuilder() throws ParserConfigurationException {
[camel] 12/27: [CAMEL-11807] Upgrade camel-stax 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 2e5220390595335e09f73e808ef85ec7c6e7e8f2
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 11:43:17 2020 +0200
[CAMEL-11807] Upgrade camel-stax to junit5
---
components/camel-stax/pom.xml | 2 +-
.../component/stax/IssueWithWrongEncodingTest.java | 7 ++++--
.../stax/SpringStAXJAXBIteratorExpressionTest.java | 10 ++++----
.../camel/component/stax/StAXComponentRefTest.java | 10 ++++----
.../camel/component/stax/StAXComponentTest.java | 10 ++++----
.../stax/StAXJAXBIteratorExpressionTest.java | 9 +++----
.../stax/StAXXPathSplitChoicePerformanceTest.java | 28 +++++++++++++---------
7 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 12a1bce..c6f225e 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -53,7 +53,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<!-- camel-jaxb is used for XPath testing -->
diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
index 1e4c3f8..b2ea4fa 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/IssueWithWrongEncodingTest.java
@@ -24,10 +24,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.stax.model.Product;
-import org.apache.camel.test.junit4.CamelTestSupport;
-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.component.stax.StAXBuilder.stax;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class IssueWithWrongEncodingTest extends CamelTestSupport {
@@ -43,6 +45,7 @@ public class IssueWithWrongEncodingTest extends CamelTestSupport {
+ "</products>";
@Override
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/encoding");
super.setUp();
diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java
index 8ad7b37..9a0176a 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java
@@ -20,12 +20,14 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.stax.model.Record;
import org.apache.camel.component.stax.model.RecordsUtil;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+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.assertEquals;
+
public class SpringStAXJAXBIteratorExpressionTest extends CamelSpringTestSupport {
@EndpointInject("mock:records")
@@ -36,7 +38,7 @@ public class SpringStAXJAXBIteratorExpressionTest extends CamelSpringTestSupport
return new ClassPathXmlApplicationContext("org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.xml");
}
- @BeforeClass
+ @BeforeAll
public static void initRouteExample() {
RecordsUtil.createXMLFile();
}
diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java
index ca150c99..4c22923 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java
@@ -23,9 +23,11 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.stax.model.RecordsUtil;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StAXComponentRefTest extends CamelTestSupport {
@@ -35,7 +37,7 @@ public class StAXComponentRefTest extends CamelTestSupport {
@BindToRegistry("myHandler")
private CountingHandler handler = new CountingHandler();
- @BeforeClass
+ @BeforeAll
public static void initRouteExample() {
RecordsUtil.createXMLFile();
}
diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java
index 26c735b..cd3de6b 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java
@@ -22,16 +22,18 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.stax.model.RecordsUtil;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StAXComponentTest extends CamelTestSupport {
@EndpointInject("mock:records")
private MockEndpoint recordsEndpoint;
- @BeforeClass
+ @BeforeAll
public static void initRouteExample() {
RecordsUtil.createXMLFile();
}
diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java
index 6f16693..f44bc31 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java
@@ -21,17 +21,18 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.stax.model.Record;
import org.apache.camel.component.stax.model.RecordsUtil;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.stax.StAXBuilder.stax;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StAXJAXBIteratorExpressionTest extends CamelTestSupport {
@EndpointInject("mock:records")
private MockEndpoint recordsEndpoint;
- @BeforeClass
+ @BeforeAll
public static void initRouteExample() {
RecordsUtil.createXMLFile();
}
diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceTest.java
index 4c81acc..199c950 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceTest.java
@@ -26,20 +26,25 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.stax.model.Order;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
-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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.camel.component.stax.StAXBuilder.stax;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
*/
-@Ignore("this is a manual test")
+@Disabled("this is a manual test")
public class StAXXPathSplitChoicePerformanceTest extends CamelTestSupport {
private int size = 20 * 1000;
@@ -48,9 +53,10 @@ public class StAXXPathSplitChoicePerformanceTest extends CamelTestSupport {
private final AtomicInteger med = new AtomicInteger();
private final AtomicInteger large = new AtomicInteger();
private final StopWatch watch = new StopWatch();
+ private final Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
createDataFile(log, size);
super.setUp();
@@ -73,7 +79,7 @@ public class StAXXPathSplitChoicePerformanceTest extends CamelTestSupport {
assertEquals((size / 10) * 3, med.get());
assertEquals((size / 10) * 1, large.get());
- assertTrue("Should complete route", matches);
+ assertTrue(matches, "Should complete route");
}
@Override
@@ -94,7 +100,7 @@ public class StAXXPathSplitChoicePerformanceTest extends CamelTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
String xml = exchange.getIn().getBody(String.class);
- assertTrue(xml, xml.contains("<amount>3</amount>"));
+ assertTrue(xml.contains("<amount>3</amount>"), xml);
int num = tiny.incrementAndGet();
if (num % 100 == 0) {
@@ -107,7 +113,7 @@ public class StAXXPathSplitChoicePerformanceTest extends CamelTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
String xml = exchange.getIn().getBody(String.class);
- assertTrue(xml, xml.contains("<amount>44</amount>"));
+ assertTrue(xml.contains("<amount>44</amount>"), xml);
int num = small.incrementAndGet();
if (num % 100 == 0) {
@@ -120,7 +126,7 @@ public class StAXXPathSplitChoicePerformanceTest extends CamelTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
String xml = exchange.getIn().getBody(String.class);
- assertTrue(xml, xml.contains("<amount>88</amount>"));
+ assertTrue(xml.contains("<amount>88</amount>"), xml);
int num = med.incrementAndGet();
if (num % 100 == 0) {
@@ -133,7 +139,7 @@ public class StAXXPathSplitChoicePerformanceTest extends CamelTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
String xml = exchange.getIn().getBody(String.class);
- assertTrue(xml, xml.contains("<amount>123</amount>"));
+ assertTrue(xml.contains("<amount>123</amount>"), xml);
int num = large.incrementAndGet();
if (num % 100 == 0) {
[camel] 08/27: [CAMEL-11807] Upgrade camel-spring-batch 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 a1270aa065a5d07581902ba3e92ce6bf325b7f18
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 10:47:05 2020 +0200
[CAMEL-11807] Upgrade camel-spring-batch to junit5
---
components/camel-spring-batch/pom.xml | 6 +--
.../spring/batch/SpringBatchEndpointTest.java | 48 +++++++++++++---------
.../spring/batch/SpringBatchIntegrationTest.java | 8 ++--
.../spring/batch/SpringBatchJobLauncherTest.java | 8 ++--
.../spring/batch/SpringBatchJobRegistryTest.java | 14 +++----
.../batch/support/CamelItemProcessorTest.java | 6 ++-
.../spring/batch/support/CamelItemReaderTest.java | 6 ++-
.../spring/batch/support/CamelItemWriterTest.java | 6 ++-
.../support/CamelJobExecutionListenerTest.java | 12 +++---
9 files changed, 65 insertions(+), 49 deletions(-)
diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml
index 86e3c9d..684528b 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -60,17 +60,17 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-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>
<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-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
index 1581194..583dd68 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
@@ -30,23 +30,30 @@ import org.apache.camel.component.mock.MockEndpoint;
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.junit5.CamelTestSupport;
import org.apache.commons.lang3.reflect.FieldUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.JobRegistry;
import org.springframework.batch.core.launch.JobLauncher;
-
-import static org.mockito.BDDMockito.*;
-
-@RunWith(MockitoJUnitRunner.class)
+import static org.apache.camel.test.junit5.TestSupport.header;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.BDDMockito.any;
+import static org.mockito.BDDMockito.eq;
+import static org.mockito.BDDMockito.mock;
+import static org.mockito.BDDMockito.verify;
+import static org.mockito.BDDMockito.when;
+
+@MockitoSettings(strictness = Strictness.LENIENT)
public class SpringBatchEndpointTest extends CamelTestSupport {
// Fixtures
@@ -191,15 +198,16 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
mockEndpoint.expectedBodiesReceived(jobExecution);
}
- @Test(expected = FailedToStartRouteException.class)
+ @Test
public void shouldThrowExceptionIfUsedAsConsumer() throws Exception {
// When
- context().addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("spring-batch:mockJob").to("direct:emptyEndpoint");
- }
- });
+ assertThrows(FailedToStartRouteException.class,
+ () -> context().addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("spring-batch:mockJob").to("direct:emptyEndpoint");
+ }
+ }));
}
@Test
@@ -301,7 +309,7 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
assertSame(alternativeJobLauncher, batchEndpointJobLauncher);
}
- @Test(expected = FailedToCreateRouteException.class)
+ @Test
public void shouldFailWhenThereIsNoJobLauncher() throws Exception {
// Given
SimpleRegistry registry = new SimpleRegistry();
@@ -315,10 +323,11 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
});
// When
- camelContext.start();
+ assertThrows(FailedToCreateRouteException.class,
+ () -> camelContext.start());
}
- @Test(expected = FailedToCreateRouteException.class)
+ @Test
public void shouldFailWhenThereIsMoreThanOneJobLauncher() throws Exception {
// Given
SimpleRegistry registry = new SimpleRegistry();
@@ -334,7 +343,8 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
});
// When
- camelContext.start();
+ assertThrows(FailedToCreateRouteException.class,
+ () -> camelContext.start());
}
@Test
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
index 79daf1c..bb5525d 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.spring.batch;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -37,7 +37,7 @@ public class SpringBatchIntegrationTest extends CamelSpringTestSupport {
String[] inputMessages = new String[]{"foo", "bar", "baz", null};
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java
index 7d8dc50..98e45f0 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.spring.batch;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -35,7 +35,7 @@ public class SpringBatchJobLauncherTest extends CamelSpringTestSupport {
String[] inputMessages = new String[]{"foo", "bar", "baz", null};
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java
index 3719913..5f48e17 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java
@@ -27,11 +27,9 @@ import org.apache.camel.component.spring.batch.support.CamelItemReader;
import org.apache.camel.component.spring.batch.support.CamelItemWriter;
import org.apache.camel.component.spring.batch.support.CamelJobExecutionListener;
import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
-import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecutionListener;
import org.springframework.batch.core.Step;
@@ -51,8 +49,8 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-@RunWith(CamelSpringRunner.class)
-@ContextConfiguration(classes = SpringBatchJobRegistryTest.ContextConfig.class, loader = CamelSpringDelegatingTestContextLoader.class)
+@CamelSpringBootTest
+@ContextConfiguration(classes = SpringBatchJobRegistryTest.ContextConfig.class)
public class SpringBatchJobRegistryTest extends AbstractJUnit4SpringContextTests {
@EndpointInject("mock:output")
@@ -69,7 +67,7 @@ public class SpringBatchJobRegistryTest extends AbstractJUnit4SpringContextTests
String[] inputMessages = new String[]{"foo", "bar", "baz", null};
- @Before
+ @BeforeEach
public void setUp() throws Exception {
for (String message : inputMessages) {
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java
index b09141c..141f5a0 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.spring.batch.support;
import org.apache.camel.ExchangePattern;
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 CamelItemProcessorTest extends CamelTestSupport {
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java
index 145f0b7..5fb9262 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.component.spring.batch.support;
-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 CamelItemReaderTest extends CamelTestSupport {
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java
index c8a8e8b..8094252 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.spring.batch.support;
import java.util.Collections;
-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 CamelItemWriterTest extends CamelTestSupport {
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java
index 5621213..e314126 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java
@@ -17,14 +17,16 @@
package org.apache.camel.component.spring.batch.support;
import org.apache.camel.Exchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.batch.core.JobExecution;
-@RunWith(MockitoJUnitRunner.class)
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@MockitoSettings(strictness = Strictness.LENIENT)
public class CamelJobExecutionListenerTest extends CamelTestSupport {
// Fixtures
[camel] 23/27: [CAMEL-11807] Upgrade camel-web3j 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 4f9a3ca5c142cc7cc813623defa3c5c965f42226
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 12:39:15 2020 +0200
[CAMEL-11807] Upgrade camel-web3j to junit5
---
components/camel-web3j/pom.xml | 8 ++--
.../Web3jConsumerBlockObservableMockTest.java | 2 +-
...tAndSubscribeToNewBlocksObservableMockTest.java | 2 +-
...bscribeToNewTransactionsObservableMockTest.java | 2 +-
...merCatchUpToLatestBlocksObservableMockTest.java | 2 +-
...chUpToLatestTransactionsObservableMockTest.java | 2 +-
...eb3jConsumerEthBlockHashObservableMockTest.java | 2 +-
.../Web3jConsumerEthLogObservableMockTest.java | 2 +-
...thPendingTransactionHashObservableMockTest.java | 2 +-
...nsumerPendingTransactionObservableMockTest.java | 2 +-
...Web3jConsumerReplyBlocksObservableMockTest.java | 2 +-
...onsumerReplyTransactionsObservableMockTest.java | 2 +-
...Web3jConsumerTransactionObservableMockTest.java | 2 +-
.../component/web3j/Web3jMockTestSupport.java | 14 +++----
.../camel/component/web3j/Web3jProducerTest.java | 3 +-
.../component/web3j/Web3jQuorumProducerTest.java | 4 +-
.../integration/Web3jConsumerBlockHashTest.java | 6 +--
.../web3j/integration/Web3jConsumerBlockTest.java | 6 +--
.../web3j/integration/Web3jConsumerLogTest.java | 6 +--
.../integration/Web3jConsumerMainnetTest.java | 6 +--
.../integration/Web3jConsumerReplayBlockTest.java | 6 +--
.../integration/Web3jConsumerTransactionsTest.java | 6 +--
.../integration/Web3jIntegrationTestSupport.java | 2 +-
.../integration/Web3jProducerGanacheTest.java | 43 +++++++++++-----------
.../integration/Web3jProducerMainnetTest.java | 7 ++--
25 files changed, 73 insertions(+), 68 deletions(-)
diff --git a/components/camel-web3j/pom.xml b/components/camel-web3j/pom.xml
index 11a48aa..84f3dc3 100644
--- a/components/camel-web3j/pom.xml
+++ b/components/camel-web3j/pom.xml
@@ -62,12 +62,12 @@
<!-- for 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>
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerBlockObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerBlockObservableMockTest.java
index 79d2f4c..2e60cdd 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerBlockObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerBlockObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewBlocksObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewBlocksObservableMockTest.java
index a87948f..cf5c7b1 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewBlocksObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewBlocksObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewTransactionsObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewTransactionsObservableMockTest.java
index 89b11ce..af37ce2 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewTransactionsObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestAndSubscribeToNewTransactionsObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestBlocksObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestBlocksObservableMockTest.java
index 36c7e5b..e8db9fd 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestBlocksObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestBlocksObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestTransactionsObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestTransactionsObservableMockTest.java
index 68fce1c..7257548 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestTransactionsObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerCatchUpToLatestTransactionsObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthBlockHashObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthBlockHashObservableMockTest.java
index b2d8b3c..9255e7d 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthBlockHashObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthBlockHashObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthLogObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthLogObservableMockTest.java
index f44a401..1b6609e 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthLogObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthLogObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthPendingTransactionHashObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthPendingTransactionHashObservableMockTest.java
index c5e34e0..66cee52 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthPendingTransactionHashObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerEthPendingTransactionHashObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerPendingTransactionObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerPendingTransactionObservableMockTest.java
index 00bc430..d1b10c5 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerPendingTransactionObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerPendingTransactionObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyBlocksObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyBlocksObservableMockTest.java
index 9bc8fcc..764063b 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyBlocksObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyBlocksObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyTransactionsObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyTransactionsObservableMockTest.java
index 5f650aa..5690bc9 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyTransactionsObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerReplyTransactionsObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerTransactionObservableMockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerTransactionObservableMockTest.java
index 1daba8d..ef32d62 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerTransactionObservableMockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jConsumerTransactionObservableMockTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.web3j;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
index 5824457..237adda 100755
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
@@ -21,10 +21,10 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.web3j.protocol.Web3j;
@@ -61,16 +61,16 @@ public class Web3jMockTestSupport extends CamelTestSupport {
return exchange;
}
- @BeforeClass
+ @BeforeAll
public static void startServer() throws Exception {
}
- @AfterClass
+ @AfterAll
public static void stopServer() throws Exception {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
super.setUp();
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java
index 8178e71..bd7fc61 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.web3j.protocol.core.DefaultBlockParameterName;
@@ -86,6 +86,7 @@ import org.web3j.protocol.core.methods.response.Web3ClientVersion;
import org.web3j.protocol.core.methods.response.Web3Sha3;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
index 808e581..6257cd0 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.web3j.protocol.core.Request;
@@ -37,6 +37,8 @@ import org.web3j.quorum.methods.response.Vote;
import org.web3j.quorum.methods.response.Voter;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
public class Web3jQuorumProducerTest extends Web3jMockTestSupport {
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockHashTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockHashTest.java
index 2c41b8f..909dce9 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockHashTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockHashTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.ETH_BLOCK_HASH_OBSERVABLE;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
-@Ignore("Requires Ganache instance with few transactions")
+@Disabled("Requires Ganache instance with few transactions")
public class Web3jConsumerBlockHashTest extends Web3jIntegrationTestSupport {
@Test
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockTest.java
index 396052c..6456bef 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerBlockTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.BLOCK_OBSERVABLE;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
-@Ignore("Requires Ganache instance with few transactions")
+@Disabled("Requires Ganache instance with few transactions")
public class Web3jConsumerBlockTest extends Web3jIntegrationTestSupport {
@Test
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerLogTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerLogTest.java
index eae8edc..7c2b111 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerLogTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerLogTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.ETH_LOG_OBSERVABLE;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
-@Ignore("Requires Ganache instance with few transactions")
+@Disabled("Requires Ganache instance with few transactions")
public class Web3jConsumerLogTest extends Web3jIntegrationTestSupport {
@Test
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerMainnetTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerMainnetTest.java
index 43ceadf..ab1683c 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerMainnetTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerMainnetTest.java
@@ -22,14 +22,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.web3j.protocol.core.methods.response.EthBlock;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
import static org.apache.camel.component.web3j.Web3jConstants.REPLAY_BLOCKS_OBSERVABLE;
-@Ignore("Requires a local node or registration at Infura")
+@Disabled("Requires a local node or registration at Infura")
public class Web3jConsumerMainnetTest extends Web3jIntegrationTestSupport {
@Override
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerReplayBlockTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerReplayBlockTest.java
index 8f68e07..1392b54 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerReplayBlockTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerReplayBlockTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
import static org.apache.camel.component.web3j.Web3jConstants.REPLAY_BLOCKS_OBSERVABLE;
-@Ignore("Requires Ganache instance with 10 transactions")
+@Disabled("Requires Ganache instance with 10 transactions")
public class Web3jConsumerReplayBlockTest extends Web3jIntegrationTestSupport {
@Test
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerTransactionsTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerTransactionsTest.java
index a920ef3..43396fe 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerTransactionsTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jConsumerTransactionsTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.web3j.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
import static org.apache.camel.component.web3j.Web3jConstants.TRANSACTION_OBSERVABLE;
-@Ignore("Requires Ganache instance with few transactions")
+@Disabled("Requires Ganache instance with few transactions")
public class Web3jConsumerTransactionsTest extends Web3jIntegrationTestSupport {
@Test
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java
index c9ce794..a6f2dd1 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java
@@ -20,7 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
public class Web3jIntegrationTestSupport extends CamelTestSupport {
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
index 3268709..6290262 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
@@ -24,8 +24,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.web3j.protocol.core.methods.response.EthBlock;
import org.web3j.protocol.core.methods.response.EthCompileSolidity;
import org.web3j.protocol.core.methods.response.EthLog;
@@ -117,8 +117,9 @@ import static org.apache.camel.component.web3j.Web3jConstants.TTL;
import static org.apache.camel.component.web3j.Web3jConstants.VALUE;
import static org.apache.camel.component.web3j.Web3jConstants.WEB3_CLIENT_VERSION;
import static org.apache.camel.component.web3j.Web3jConstants.WEB3_SHA3;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-@Ignore("Requires a locally running Ganache instance")
+@Disabled("Requires a locally running Ganache instance")
public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
@Produce("direct:start")
@@ -158,7 +159,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//a bug in Ganache returns wrong formatted data
- @Ignore
+ @Disabled
@Test
public void ethNetPeerCountTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, NET_PEER_COUNT);
@@ -271,7 +272,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//a bug in Ganache returns wrong formatted data
- @Ignore
+ @Disabled
@Test
public void ethGetBlockTransactionCountByHashTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, ETH_GET_BLOCK_TRANSACTION_COUNT_BY_HASH);
@@ -282,7 +283,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//a bug in Ganache returns wrong formatted data
- @Ignore
+ @Disabled
@Test
public void ethGetBlockTransactionCountByNumberTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, ETH_GET_BLOCK_TRANSACTION_COUNT_BY_NUMBER);
@@ -293,7 +294,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethGetUncleCountByBlockHashTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, ETH_GET_UNCLE_COUNT_BY_BLOCK_HASH);
@@ -304,7 +305,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethGetUncleCountByBlockNumberTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, ETH_GET_UNCLE_COUNT_BY_BLOCK_HASH);
@@ -352,7 +353,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//wrong reminder
- @Ignore
+ @Disabled
@Test
public void ethSendRawTransactionTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, ETH_SEND_RAW_TRANSACTION);
@@ -447,7 +448,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethGetUncleByBlockHashAndIndexTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, ETH_GET_UNCLE_BY_BLOCK_HASH_AND_INDEX);
@@ -460,7 +461,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethGetUncleByBlockNumberAndIndexTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, ETH_GET_UNCLE_BY_BLOCK_NUMBER_AND_INDEX);
@@ -482,7 +483,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethCompileSolidityTest() throws Exception {
String soliditySample =
@@ -501,7 +502,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethCompileLLLTest() throws Exception {
String sampleCode = "(returnlll (suicide (caller)))";
@@ -513,7 +514,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void ethCompileSerpentTest() throws Exception {
String serpentSample = "(returnlll (suicide (caller)))";
@@ -640,7 +641,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhPostTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, SHH_POST);
@@ -657,7 +658,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhNewIdentityTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, SHH_NEW_IDENTITY);
@@ -668,7 +669,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhHasIdentityTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, SHH_HAS_IDENTITY);
@@ -680,7 +681,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhNewGroupTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, SHH_NEW_GROUP);
@@ -691,7 +692,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhAddToGroupTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, SHH_ADD_TO_GROUP);
@@ -703,7 +704,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhNewFilterTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, SHH_NEW_FILTER);
@@ -716,7 +717,7 @@ public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport {
}
//not supported operation by Ganache
- @Ignore
+ @Disabled
@Test
public void shhUninstallFilterTest() throws Exception {
Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, SHH_UNINSTALL_FILTER);
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java
index 5a68c8f..7bee939 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.web3j.Web3jConstants.ETH_BLOCK_NUMBER;
import static org.apache.camel.component.web3j.Web3jConstants.NET_VERSION;
@@ -29,8 +29,9 @@ import static org.apache.camel.component.web3j.Web3jConstants.OPERATION;
import static org.apache.camel.component.web3j.Web3jConstants.TRANSACTION;
import static org.apache.camel.component.web3j.Web3jConstants.WEB3_CLIENT_VERSION;
import static org.apache.camel.component.web3j.Web3jConstants.WEB3_SHA3;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-@Ignore("Requires a local node or registration at Infura")
+@Disabled("Requires a local node or registration at Infura")
public class Web3jProducerMainnetTest extends Web3jIntegrationTestSupport {
@Produce("direct:start")
[camel] 21/27: [CAMEL-11807] Upgrade camel-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 d3fba2f3401e53512e7ff9df05b3a10443ba4b55
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 12:31:53 2020 +0200
[CAMEL-11807] Upgrade camel-vertx to junit5
---
components/camel-vertx/pom.xml | 2 +-
.../org/apache/camel/component/vertx/VertxBaseTestSupport.java | 10 +++++++---
.../camel/component/vertx/VertxMultipleConsumerTest.java | 2 +-
.../apache/camel/component/vertx/VertxRequestReplyTest.java | 4 +++-
.../org/apache/camel/component/vertx/VertxRoutePubSubTest.java | 2 +-
.../java/org/apache/camel/component/vertx/VertxRouteTest.java | 2 +-
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml
index f840107..0ebbcdd 100644
--- a/components/camel-vertx/pom.xml
+++ b/components/camel-vertx/pom.xml
@@ -55,7 +55,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-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
index 0399584..571232d 100644
--- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
+++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
@@ -17,14 +17,18 @@
package org.apache.camel.component.vertx;
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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class VertxBaseTestSupport extends CamelTestSupport {
protected static int port;
- @BeforeClass
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
+ @BeforeAll
public static void initPort() throws Exception {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxMultipleConsumerTest.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxMultipleConsumerTest.java
index aca7b45..c044b22 100644
--- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxMultipleConsumerTest.java
+++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxMultipleConsumerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.vertx;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class VertxMultipleConsumerTest extends VertxBaseTestSupport {
diff --git a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRequestReplyTest.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRequestReplyTest.java
index aaa0c1f..959afed 100644
--- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRequestReplyTest.java
+++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRequestReplyTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.vertx;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class VertxRequestReplyTest extends VertxBaseTestSupport {
diff --git a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java
index 31e5db9..b075670 100644
--- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java
+++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class VertxRoutePubSubTest extends VertxBaseTestSupport {
diff --git a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java
index 17005ac..247e6dc 100644
--- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java
+++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class VertxRouteTest extends VertxBaseTestSupport {
[camel] 07/27: [CAMEL-11807] Upgrade camel-splunk 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 299704224f0370c93fe5cf10b0837b57cc715386
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 10:35:36 2020 +0200
[CAMEL-11807] Upgrade camel-splunk to junit5
---
components/camel-splunk/pom.xml | 4 ++--
.../camel/component/splunk/ConsumerStreamingTest.java | 10 ++++++----
.../apache/camel/component/splunk/ConsumerTest.java | 10 ++++++----
.../apache/camel/component/splunk/ProducerTest.java | 19 +++++++++++--------
.../camel/component/splunk/RawProducerTest.java | 12 ++++++------
.../splunk/SplunkComponentConfigurationTest.java | 14 ++++++++++----
.../camel/component/splunk/SplunkEventTest.java | 14 ++++++++------
.../camel/component/splunk/SplunkMockTestSupport.java | 8 ++++----
.../splunk/integration/NormalSearchTest.java | 9 ++++++---
.../splunk/integration/RealtimeSearchTest.java | 9 ++++++---
.../component/splunk/integration/SavedSearchTest.java | 9 ++++++---
.../splunk/integration/SplunkProducerTest.java | 6 +++---
.../component/splunk/integration/SplunkTest.java | 6 +++---
13 files changed, 77 insertions(+), 53 deletions(-)
diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml
index 4108fb4..e1aba10 100644
--- a/components/camel-splunk/pom.xml
+++ b/components/camel-splunk/pom.xml
@@ -69,7 +69,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -79,7 +79,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
index d975024..67df233 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
@@ -24,16 +24,18 @@ import com.splunk.JobCollection;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ConsumerStreamingTest extends SplunkMockTestSupport {
@Mock
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
index d1f639e..78ec19e 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
@@ -25,16 +25,18 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ConsumerTest extends SplunkMockTestSupport {
@Mock
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java
index e06be45..a53aa85 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java
@@ -32,17 +32,19 @@ import org.apache.camel.component.splunk.event.SplunkEvent;
import org.apache.camel.component.splunk.support.StreamDataWriter;
import org.apache.camel.component.splunk.support.SubmitDataWriter;
import org.apache.camel.component.splunk.support.TcpDataWriter;
-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.mockito.quality.Strictness;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ProducerTest extends SplunkMockTestSupport {
@EndpointInject("splunk://stream")
@@ -66,7 +68,7 @@ public class ProducerTest extends SplunkMockTestSupport {
@Mock
private InputCollection inputCollection;
- @Before
+ @BeforeEach
public void setup() throws IOException {
when(service.getIndexes()).thenReturn(indexColl);
when(service.getInputs()).thenReturn(inputCollection);
@@ -119,9 +121,10 @@ public class ProducerTest extends SplunkMockTestSupport {
assertIsInstanceOf(TcpDataWriter.class, ((SplunkProducer)tcpProducer).getDataWriter());
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testBodyWithoutRawOption() throws Exception {
- template.sendBody("direct:tcp", "foobar");
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:tcp", "foobar"));
}
@Override
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java
index 5bd5d17..af32629 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java
@@ -26,17 +26,17 @@ import com.splunk.TcpInput;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.mockito.quality.Strictness;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class RawProducerTest extends SplunkMockTestSupport {
private static final String PAYLOAD = "{foo:1, bar:2}";
@@ -61,7 +61,7 @@ public class RawProducerTest extends SplunkMockTestSupport {
@Mock
private InputCollection inputCollection;
- @Before
+ @BeforeEach
public void setup() throws IOException {
when(service.getIndexes()).thenReturn(indexColl);
when(service.getInputs()).thenReturn(inputCollection);
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
index cd33c2d..72d1745 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
@@ -18,8 +18,13 @@ package org.apache.camel.component.splunk;
import com.splunk.SSLSecurityProtocol;
import com.splunk.Service;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SplunkComponentConfigurationTest extends CamelTestSupport {
@@ -39,10 +44,11 @@ public class SplunkComponentConfigurationTest extends CamelTestSupport {
assertEquals(SSLSecurityProtocol.TLSv1_2, endpoint.getConfiguration().getSslProtocol());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createProducerWithoutUserAndPassword() throws Exception {
SplunkComponent component = context.getComponent("splunk", SplunkComponent.class);
- component.createEndpoint("splunk://test");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("splunk://test"));
}
@Test
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkEventTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkEventTest.java
index c769b58..ed7090f 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkEventTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkEventTest.java
@@ -21,10 +21,12 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class SplunkEventTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SplunkEventTest {
@Test
public void testEventDataWithQuotedValues() {
@@ -33,10 +35,10 @@ public class SplunkEventTest extends Assert {
event.addPair("key1", "value1");
event.addPair("key2", "value2 with whitespace");
event.addPair(SplunkEvent.COMMON_DVC_TIME, now);
- assertEquals("Values should be quoted", "name=\"testevent\" event_id=\"123\" key1=\"value1\" key2=\"value2 with whitespace\" dvc_time=\"" + now.toString() + "\"\n",
- event.toString());
+ assertEquals("name=\"testevent\" event_id=\"123\" key1=\"value1\" key2=\"value2 with whitespace\" dvc_time=\"" + now.toString() + "\"\n",
+ event.toString(), "Values should be quoted");
assertEquals(5, event.getEventData().size());
- assertTrue(event.getEventData().get("key2").equals("value2 with whitespace"));
+ assertEquals("value2 with whitespace", event.getEventData().get("key2"));
}
@Test
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java
index 67630df..e83eaaf 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkMockTestSupport.java
@@ -20,12 +20,12 @@ import java.net.Socket;
import com.splunk.Service;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public abstract class SplunkMockTestSupport extends CamelTestSupport {
@Mock
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
index 8745f64..c0708a3 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
@@ -22,10 +22,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("run manually since it requires a running local splunk server")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("run manually since it requires a running local splunk server")
public class NormalSearchTest extends SplunkTest {
@Test
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
index c03395a..546e39b 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
@@ -21,10 +21,13 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("run manually since it requires a running local splunk server")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("run manually since it requires a running local splunk server")
public class RealtimeSearchTest extends SplunkTest {
@Test
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
index 4d0ce93..f980d8d 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
@@ -22,10 +22,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("run manually since it requires a running local splunk server")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("run manually since it requires a running local splunk server")
public class SavedSearchTest extends SplunkTest {
// before run there should be created a saved search 'junit' in splunk
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkProducerTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkProducerTest.java
index ae16e59..b0cf0be 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkProducerTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkProducerTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.splunk.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("run manually since it requires a running local splunk server")
+@Disabled("run manually since it requires a running local splunk server")
public class SplunkProducerTest extends SplunkTest {
// Splunk tcp receiver port configured in Splunk
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java
index e526090a2..d24ff3f 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SplunkTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.splunk.integration;
import org.apache.camel.component.splunk.event.SplunkEvent;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
public abstract class SplunkTest extends CamelTestSupport {
// TEST WILL RUN ON SPLUNK DEFAULT LOCALHOST+PORT
@@ -30,7 +30,7 @@ public abstract class SplunkTest extends CamelTestSupport {
// should be created in splunk before test run;
protected static final String INDEX = "junit";
- @Before
+ @BeforeEach
public void init() throws Exception {
SplunkEvent splunkEvent = new SplunkEvent();
splunkEvent.addPair("key1", "value1");
[camel] 18/27: [CAMEL-11807] Upgrade camel-thrift 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 63cfacedecc482b88a883e5c372e8cc7180270c7
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 12:03:29 2020 +0200
[CAMEL-11807] Upgrade camel-thrift to junit5
---
components/camel-thrift/pom.xml | 6 +++---
.../component/thrift/ThriftConsumerAsyncTest.java | 16 ++++++++++------
.../thrift/ThriftConsumerConcurrentTest.java | 11 +++++++----
.../thrift/ThriftConsumerSecurityTest.java | 16 ++++++++++------
.../component/thrift/ThriftConsumerSyncTest.java | 16 ++++++++++------
.../thrift/ThriftConsumerZlibCompressionTest.java | 16 ++++++++++------
.../component/thrift/ThriftProducerAsyncTest.java | 9 +++++++--
.../component/thrift/ThriftProducerBaseTest.java | 10 +++++-----
.../thrift/ThriftProducerSecurityTest.java | 22 ++++++++++++++--------
.../component/thrift/ThriftProducerSyncTest.java | 12 +++++++++---
.../thrift/ThriftProducerZlibCompressionTest.java | 17 +++++++++++------
.../thrift/local/ThriftThreadPoolServerTest.java | 14 ++++++++------
.../thrift/ThriftMarshalAndUnmarshalJsonTest.java | 6 ++++--
.../ThriftMarshalAndUnmarshalSpringTest.java | 10 +++++++---
.../thrift/ThriftMarshalAndUnmarshalTest.java | 10 +++++++---
15 files changed, 122 insertions(+), 69 deletions(-)
diff --git a/components/camel-thrift/pom.xml b/components/camel-thrift/pom.xml
index d0747f3..571145e 100644
--- a/components/camel-thrift/pom.xml
+++ b/components/camel-thrift/pom.xml
@@ -61,12 +61,12 @@
<!-- testing -->
<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>
<dependency>
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java
index 5fc1b58..1dea8f6 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java
@@ -30,19 +30,23 @@ import org.apache.camel.component.thrift.generated.Calculator;
import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.async.TAsyncClientManager;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.transport.TNonblockingSocket;
import org.apache.thrift.transport.TNonblockingTransport;
import org.apache.thrift.transport.TTransportException;
-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;
+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 ThriftConsumerAsyncTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerAsyncTest.class);
private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
@@ -57,7 +61,7 @@ public class ThriftConsumerAsyncTest extends CamelTestSupport {
private int allTypesResult;
private Work echoResult;
- @Before
+ @BeforeEach
public void startThriftClient() throws IOException, TTransportException {
if (transport == null) {
LOG.info("Connecting to the Thrift server on port: {}", THRIFT_TEST_PORT);
@@ -66,7 +70,7 @@ public class ThriftConsumerAsyncTest extends CamelTestSupport {
}
}
- @After
+ @AfterEach
public void stopThriftClient() throws Exception {
if (transport != null) {
transport.close();
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java
index 5de4e51..cf17850 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.component.thrift.generated.Calculator;
import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.async.TAsyncClientManager;
@@ -40,10 +40,13 @@ import org.apache.thrift.transport.TNonblockingTransport;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
-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.assertNotNull;
+
public class ThriftConsumerConcurrentTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerConcurrentTest.class);
@@ -83,7 +86,7 @@ public class ThriftConsumerConcurrentTest extends CamelTestSupport {
LOG.info("Exception", e);
}
- assertNotNull("instanceId = " + instanceId, calculateResponse);
+ assertNotNull(calculateResponse, "instanceId = " + instanceId);
assertEquals(instanceId * THRIFT_TEST_NUM1, calculateResponse);
transport.close();
@@ -114,7 +117,7 @@ public class ThriftConsumerConcurrentTest extends CamelTestSupport {
latch.await(5, TimeUnit.SECONDS);
int calculateResponse = calculateCallback.getCalculateResponse();
- assertNotNull("instanceId = " + instanceId, calculateResponse);
+ assertNotNull(calculateResponse, "instanceId = " + instanceId);
assertEquals(instanceId * THRIFT_TEST_NUM1, calculateResponse);
transport.close();
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
index afa9179..6e7308c 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
@@ -29,18 +29,22 @@ import org.apache.camel.support.jsse.KeyManagersParameters;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSSLTransportFactory;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
-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;
+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 ThriftConsumerSecurityTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerSecurityTest.class);
private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
@@ -56,7 +60,7 @@ public class ThriftConsumerSecurityTest extends CamelTestSupport {
private TProtocol protocol;
private TTransport transport;
- @Before
+ @BeforeEach
public void startThriftSecureClient() throws IOException, TTransportException {
if (transport == null) {
LOG.info("Connecting to the secured Thrift server on port: {}", THRIFT_TEST_PORT);
@@ -72,7 +76,7 @@ public class ThriftConsumerSecurityTest extends CamelTestSupport {
}
}
- @After
+ @AfterEach
public void stopThriftClient() throws Exception {
if (transport != null) {
transport.close();
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java
index c68d47b..fb7bfcb 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java
@@ -24,19 +24,23 @@ import org.apache.camel.component.thrift.generated.Calculator;
import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TFramedTransport;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
-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;
+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 ThriftConsumerSyncTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerSyncTest.class);
private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
@@ -47,7 +51,7 @@ public class ThriftConsumerSyncTest extends CamelTestSupport {
private TProtocol protocol;
private TTransport transport;
- @Before
+ @BeforeEach
public void startThriftClient() throws IOException, TTransportException {
if (transport == null) {
LOG.info("Connecting to the Thrift server on port: {}", THRIFT_TEST_PORT);
@@ -58,7 +62,7 @@ public class ThriftConsumerSyncTest extends CamelTestSupport {
}
}
- @After
+ @AfterEach
public void stopThriftClient() throws Exception {
if (transport != null) {
transport.close();
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java
index 12c3859..b2040c3 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java
@@ -24,19 +24,23 @@ import org.apache.camel.component.thrift.generated.Calculator;
import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
import org.apache.thrift.transport.TZlibTransport;
-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;
+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 ThriftConsumerZlibCompressionTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerZlibCompressionTest.class);
private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
@@ -49,7 +53,7 @@ public class ThriftConsumerZlibCompressionTest extends CamelTestSupport {
private TProtocol protocol;
private TTransport transport;
- @Before
+ @BeforeEach
public void startThriftZlibClient() throws IOException, TTransportException {
if (transport == null) {
LOG.info("Connecting to the Thrift server with zlib compression on port: {}", THRIFT_TEST_PORT);
@@ -62,7 +66,7 @@ public class ThriftConsumerZlibCompressionTest extends CamelTestSupport {
}
}
- @After
+ @AfterEach
public void stopThriftClient() throws Exception {
if (transport != null) {
transport.close();
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerAsyncTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerAsyncTest.java
index fd89b8a..118879e 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerAsyncTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerAsyncTest.java
@@ -30,10 +30,15 @@ import org.apache.camel.component.thrift.generated.InvalidOperation;
import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.support.SynchronizationAdapter;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ThriftProducerAsyncTest extends ThriftProducerBaseTest {
private static final Logger LOG = LoggerFactory.getLogger(ThriftProducerAsyncTest.class);
@@ -130,7 +135,7 @@ public class ThriftProducerAsyncTest extends ThriftProducerBaseTest {
});
latch.await(5, TimeUnit.SECONDS);
- assertTrue("Get an InvalidOperation exception", responseBody instanceof InvalidOperation);
+ assertTrue(responseBody instanceof InvalidOperation, "Get an InvalidOperation exception");
}
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java
index 14b9e5f..f65b948 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java
@@ -21,13 +21,13 @@ import java.io.IOException;
import org.apache.camel.component.thrift.generated.Calculator;
import org.apache.camel.component.thrift.impl.CalculatorSyncServerImpl;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.thrift.server.THsHaServer;
import org.apache.thrift.server.THsHaServer.Args;
import org.apache.thrift.server.TServer;
import org.apache.thrift.transport.TNonblockingServerSocket;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +42,7 @@ public class ThriftProducerBaseTest extends CamelTestSupport {
private static TNonblockingServerSocket serverTransport;
private static TServer server;
- @BeforeClass
+ @BeforeAll
@SuppressWarnings({"unchecked", "rawtypes"})
public static void startThriftServer() throws Exception {
processor = new Calculator.Processor(new CalculatorSyncServerImpl());
@@ -57,7 +57,7 @@ public class ThriftProducerBaseTest extends CamelTestSupport {
new Thread(simple).start();
}
- @AfterClass
+ @AfterAll
public static void stopThriftServer() throws IOException {
if (server != null) {
server.stop();
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
index c9b4114..4eeac59 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
@@ -37,17 +37,23 @@ import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TSSLTransportFactory;
import org.apache.thrift.transport.TServerSocket;
-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 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 ThriftProducerSecurityTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftProducerSecurityTest.class);
@@ -65,7 +71,7 @@ public class ThriftProducerSecurityTest extends CamelTestSupport {
private static final String SECURITY_STORE_PASSWORD = "camelinaction";
private static final int THRIFT_CLIENT_TIMEOUT = 2000;
- @BeforeClass
+ @BeforeAll
@SuppressWarnings({"unchecked", "rawtypes"})
public static void startThriftServer() throws Exception {
processor = new Calculator.Processor(new CalculatorSyncServerImpl());
@@ -87,7 +93,7 @@ public class ThriftProducerSecurityTest extends CamelTestSupport {
new Thread(simple).start();
}
- @AfterClass
+ @AfterAll
public static void stopThriftServer() throws IOException {
if (server != null) {
server.stop();
@@ -145,8 +151,8 @@ public class ThriftProducerSecurityTest extends CamelTestSupport {
template.requestBody("direct:thrift-secured-calculate", requestBody);
fail("Expect the exception here");
} catch (Exception ex) {
- assertTrue("Expect CamelExecutionException", ex instanceof CamelExecutionException);
- assertTrue("Get an InvalidOperation exception", ex.getCause() instanceof InvalidOperation);
+ assertTrue(ex instanceof CamelExecutionException, "Expect CamelExecutionException");
+ assertTrue(ex.getCause() instanceof InvalidOperation, "Get an InvalidOperation exception");
}
}
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSyncTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSyncTest.java
index 96a4ac7..c48b497 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSyncTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSyncTest.java
@@ -27,10 +27,16 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.thrift.generated.InvalidOperation;
import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
-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.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 ThriftProducerSyncTest extends ThriftProducerBaseTest {
private static final Logger LOG = LoggerFactory.getLogger(ThriftProducerSyncTest.class);
@@ -82,8 +88,8 @@ public class ThriftProducerSyncTest extends ThriftProducerBaseTest {
template.requestBody("direct:thrift-calculate", requestBody);
fail("Expect the exception here");
} catch (Exception ex) {
- assertTrue("Expect CamelExecutionException", ex instanceof CamelExecutionException);
- assertTrue("Get an InvalidOperation exception", ex.getCause() instanceof InvalidOperation);
+ assertTrue(ex instanceof CamelExecutionException, "Expect CamelExecutionException");
+ assertTrue(ex.getCause() instanceof InvalidOperation, "Get an InvalidOperation exception");
}
}
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java
index 9afc74b..17d68cd 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java
@@ -28,18 +28,23 @@ import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.component.thrift.impl.CalculatorSyncServerImpl;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TServerSocket;
import org.apache.thrift.transport.TZlibTransport;
-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 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;
+
public class ThriftProducerZlibCompressionTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftProducerZlibCompressionTest.class);
@@ -53,7 +58,7 @@ public class ThriftProducerZlibCompressionTest extends CamelTestSupport {
private static final int THRIFT_TEST_NUM2 = 13;
private static final int THRIFT_CLIENT_TIMEOUT = 2000;
- @BeforeClass
+ @BeforeAll
@SuppressWarnings({"unchecked", "rawtypes"})
public static void startThriftServer() throws Exception {
processor = new Calculator.Processor(new CalculatorSyncServerImpl());
@@ -74,7 +79,7 @@ public class ThriftProducerZlibCompressionTest extends CamelTestSupport {
new Thread(simple).start();
}
- @AfterClass
+ @AfterAll
public static void stopThriftServer() throws IOException {
if (server != null) {
server.stop();
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java
index 469a2de..3b17d2a 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.component.thrift.generated.Calculator;
import org.apache.camel.component.thrift.impl.CalculatorSyncServerImpl;
import org.apache.camel.component.thrift.server.ThriftThreadPoolServer;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
@@ -32,12 +32,14 @@ import org.apache.thrift.server.TServer;
import org.apache.thrift.transport.TSSLTransportFactory;
import org.apache.thrift.transport.TServerSocket;
import org.apache.thrift.transport.TTransport;
-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;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* TBD
*/
@@ -60,7 +62,7 @@ public class ThriftThreadPoolServerTest extends CamelTestSupport {
@SuppressWarnings({"rawtypes"})
private static Calculator.Processor processor;
- @Before
+ @BeforeEach
@SuppressWarnings({"unchecked", "rawtypes"})
public void startThriftServer() throws Exception {
processor = new Calculator.Processor(new CalculatorSyncServerImpl());
@@ -81,7 +83,7 @@ public class ThriftThreadPoolServerTest extends CamelTestSupport {
LOG.info("Thrift secured server started on port: {}", THRIFT_TEST_PORT);
}
- @After
+ @AfterEach
public void stopThriftServer() throws IOException {
if (server != null) {
server.stop();
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalJsonTest.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalJsonTest.java
index 756ae21..025c899 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalJsonTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalJsonTest.java
@@ -21,8 +21,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.thrift.generated.Operation;
import org.apache.camel.dataformat.thrift.generated.Work;
-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 ThriftMarshalAndUnmarshalJsonTest extends CamelTestSupport {
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalSpringTest.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalSpringTest.java
index f34b935..1feb829 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalSpringTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalSpringTest.java
@@ -22,10 +22,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.thrift.generated.Operation;
import org.apache.camel.dataformat.thrift.generated.Work;
-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;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
public class ThriftMarshalAndUnmarshalSpringTest extends CamelSpringTestSupport {
private static final String WORK_TEST_COMMENT = "This is a test thrift data";
private static final int WORK_TEST_NUM1 = 1;
@@ -63,7 +67,7 @@ public class ThriftMarshalAndUnmarshalSpringTest extends CamelSpringTestSupport
});
fail("Expect the exception here");
} catch (Exception ex) {
- assertTrue("Expect FailedToCreateRouteException", ex instanceof FailedToCreateRouteException);
+ assertTrue(ex instanceof FailedToCreateRouteException, "Expect FailedToCreateRouteException");
}
}
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalTest.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalTest.java
index f5da95c..fcee951 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/ThriftMarshalAndUnmarshalTest.java
@@ -22,8 +22,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.thrift.generated.Operation;
import org.apache.camel.dataformat.thrift.generated.Work;
-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;
public class ThriftMarshalAndUnmarshalTest extends CamelTestSupport {
private static final String WORK_TEST_COMMENT = "This is a test thrift data";
@@ -57,7 +61,7 @@ public class ThriftMarshalAndUnmarshalTest extends CamelTestSupport {
});
fail("Expect the exception here");
} catch (Exception ex) {
- assertTrue("Expect FailedToCreateRouteException", ex instanceof FailedToCreateRouteException);
+ assertTrue(ex instanceof FailedToCreateRouteException, "Expect FailedToCreateRouteException");
}
}
[camel] 02/27: [CAMEL-11807] Upgrade camel-soap 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 20123fbaeb55aebd3467b902282db2aefb51ceea
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jul 22 22:26:59 2020 +0200
[CAMEL-11807] Upgrade camel-soap to junit5
---
components/camel-soap/pom.xml | 11 ++++++--
.../converter/soap/name/QNameStrategyTest.java | 7 +++--
.../soap/name/ServiceInterfaceStrategyTest.java | 9 ++++--
.../converter/soap/name/TypeNameStrategyTest.java | 20 ++++++++------
...otElementPreferringElementNameStrategyTest.java | 22 ++++++++-------
.../camel/dataformat/soap/SoapClientTest.java | 6 ++--
.../camel/dataformat/soap/SoapCxfClientTest.java | 32 ++++++++++++----------
.../camel/dataformat/soap/SoapCxfServerTest.java | 22 ++++++++-------
.../camel/dataformat/soap/SoapMarshalTest.java | 4 +--
.../camel/dataformat/soap/SoapRoundtripTest.java | 7 +++--
.../camel/dataformat/soap/SoapServerTest.java | 6 ++--
.../dataformat/soap/SoapSpringRoundtripTest.java | 15 +++++-----
.../dataformat/soap/SoapToSoapDontIgnoreTest.java | 19 +++++++------
.../dataformat/soap/SoapToSoapIgnoreTest.java | 19 +++++++------
.../soap/SoapToSoapSingleDataFormatterTest.java | 19 +++++++------
.../camel/dataformat/soap/SoapUnMarshalTest.java | 7 +++--
.../camel/dataformat/soap12/Soap12MarshalTest.java | 4 +--
.../soap12/Soap12SpringRoundtripTest.java | 15 +++++-----
.../dataformat/soap12/Soap12UnMarshalTest.java | 7 +++--
19 files changed, 146 insertions(+), 105 deletions(-)
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index d5278ca..effd09b 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -58,13 +58,18 @@
<!-- test dependencies -->
<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>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java
index 56cf1c9..6de6c70 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java
@@ -20,8 +20,9 @@ import javax.xml.namespace.QName;
import com.example.customerservice.GetCustomersByName;
import org.apache.camel.dataformat.soap.name.QNameStrategy;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class QNameStrategyTest {
@@ -35,6 +36,6 @@ public class QNameStrategyTest {
QNameStrategy strategy = new QNameStrategy(elementName);
QName actualElementName = strategy.findQNameForSoapActionOrType(null, GetCustomersByName.class);
- Assert.assertEquals(elementName, actualElementName);
+ assertEquals(elementName, actualElementName);
}
}
diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
index 6ebafa6..1c3305a 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
@@ -24,12 +24,15 @@ import com.example.customerservice.GetCustomersByNameResponse;
import com.example.customerservice.multipart.MultiPartCustomerService;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ServiceInterfaceStrategyTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class ServiceInterfaceStrategyTest {
private static final Logger LOG = LoggerFactory.getLogger(ServiceInterfaceStrategyTest.class);
@Test
diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java
index 8bd3e95..1b321d2 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java
@@ -20,8 +20,10 @@ import javax.xml.namespace.QName;
import com.example.customerservice.GetCustomersByName;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.junit.Assert;
-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.fail;
public class TypeNameStrategyTest {
@@ -29,8 +31,8 @@ public class TypeNameStrategyTest {
public void testTypeNameStrategy() {
TypeNameStrategy strategy = new TypeNameStrategy();
QName name = strategy.findQNameForSoapActionOrType("", GetCustomersByName.class);
- Assert.assertEquals("http://customerservice.example.com/", name.getNamespaceURI());
- Assert.assertEquals("getCustomersByName", name.getLocalPart());
+ assertEquals("http://customerservice.example.com/", name.getNamespaceURI());
+ assertEquals("getCustomersByName", name.getLocalPart());
}
@Test
@@ -38,7 +40,7 @@ public class TypeNameStrategyTest {
TypeNameStrategy strategy = new TypeNameStrategy();
try {
strategy.findQNameForSoapActionOrType("", String.class);
- Assert.fail();
+ fail();
} catch (RuntimeException e) {
// Expected here
}
@@ -48,11 +50,11 @@ public class TypeNameStrategyTest {
public void testNoPackageInfo() {
TypeNameStrategy strategy = new TypeNameStrategy();
QName name = strategy.findQNameForSoapActionOrType("", AnnotatedClassWithoutNamespace.class);
- Assert.assertEquals("test", name.getLocalPart());
- Assert.assertEquals("##default", name.getNamespaceURI());
+ assertEquals("test", name.getLocalPart());
+ assertEquals("##default", name.getNamespaceURI());
QName name2 = strategy.findQNameForSoapActionOrType("", AnnotatedClassWithNamespace.class);
- Assert.assertEquals("test", name2.getLocalPart());
- Assert.assertEquals("http://mynamespace", name2.getNamespaceURI());
+ assertEquals("test", name2.getLocalPart());
+ assertEquals("http://mynamespace", name2.getNamespaceURI());
}
}
diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
index 1417a55..87f95e2 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
@@ -24,9 +24,10 @@ import javax.xml.namespace.QName;
import org.apache.camel.converter.soap.name.testpackage.RequestWithDefaultNs;
import org.apache.camel.dataformat.soap.name.XmlRootElementPreferringElementNameStrategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class XmlRootElementPreferringElementNameStrategyTest {
@@ -38,24 +39,25 @@ public class XmlRootElementPreferringElementNameStrategyTest {
@Test
public void testFindQNameForSoapActionOrTypeWithXmlSchemaPresent() throws Exception {
QName qname = ens.findQNameForSoapActionOrType("abc", RequestWithDefaultNs.class);
- assertEquals("local names must match", "foo", qname.getLocalPart());
- assertEquals("namespace must match", "baz", qname.getNamespaceURI());
+ assertEquals("foo", qname.getLocalPart(), "local names must match");
+ assertEquals("baz", qname.getNamespaceURI(), "namespace must match");
}
@Test
public void testFindQNameForSoapActionOrType() throws Exception {
QName qname = ens.findQNameForSoapActionOrType(DEFAULT_NS, Request.class);
- assertEquals("local names must match", LOCAL_NAME, qname.getLocalPart());
- assertEquals("namespace must match", CUSTOM_NS, qname.getNamespaceURI());
+ assertEquals(LOCAL_NAME, qname.getLocalPart(), "local names must match");
+ assertEquals(CUSTOM_NS, qname.getNamespaceURI(), "namespace must match");
qname = ens.findQNameForSoapActionOrType(CUSTOM_NS, Request.class);
- assertEquals("local names must match", LOCAL_NAME, qname.getLocalPart());
- assertEquals("namespace must match", CUSTOM_NS, qname.getNamespaceURI());
+ assertEquals(LOCAL_NAME, qname.getLocalPart(), "local names must match");
+ assertEquals(CUSTOM_NS, qname.getNamespaceURI(), "namespace must match");
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testFindExceptionForFaultName() throws Exception {
- ens.findExceptionForFaultName(new QName(LOCAL_NAME, CUSTOM_NS));
+ assertThrows(UnsupportedOperationException.class,
+ () -> ens.findExceptionForFaultName(new QName(LOCAL_NAME, CUSTOM_NS)));
}
@XmlType(name = "", propOrder = {LOCAL_NAME})
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
index 4bcd237..7c54f5a 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
@@ -26,8 +26,10 @@ import org.apache.camel.Produce;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy;
-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;
/**
* Test that uses a dynamic proxy for CustomerService to send a request as SOAP
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java
index e0615c3..171e1cb 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java
@@ -31,18 +31,20 @@ import com.example.customerservice.SaveCustomer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Checks for interoperability between a CXF client that is attached using the
* Camel transport for CXF and the SOAP data format
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class SoapCxfClientTest extends RouteBuilder {
private static CustomerServiceImpl serverBean;
@@ -51,7 +53,7 @@ public class SoapCxfClientTest extends RouteBuilder {
protected CustomerService customerService;
- @BeforeClass
+ @BeforeAll
public static void initServerBean() {
serverBean = new CustomerServiceImpl();
}
@@ -61,18 +63,18 @@ public class SoapCxfClientTest extends RouteBuilder {
GetCustomersByName request = new GetCustomersByName();
request.setName("test");
GetCustomersByNameResponse response = customerService.getCustomersByName(request);
- Assert.assertNotNull(response);
+ assertNotNull(response);
List<Customer> customers = response.getReturn();
- Assert.assertEquals(1, customers.size());
- Assert.assertEquals("test", customers.get(0).getName());
+ assertEquals(1, customers.size());
+ assertEquals("test", customers.get(0).getName());
}
@Test
public void testRoundTripGetAllCustomers() throws Exception {
GetAllCustomersResponse response = customerService.getAllCustomers();
- Assert.assertEquals(1, response.getReturn().size());
+ assertEquals(1, response.getReturn().size());
Customer firstCustomer = response.getReturn().get(0);
- Assert.assertEquals(100000.0, firstCustomer.getRevenue(), 0.00001);
+ assertEquals(100000.0, firstCustomer.getRevenue(), 0.00001);
}
@Test
@@ -83,7 +85,7 @@ public class SoapCxfClientTest extends RouteBuilder {
request.setCustomer(testCustomer);
customerService.saveCustomer(request);
Customer customer2 = serverBean.getLastSavedCustomer();
- Assert.assertEquals("testName", customer2.getName());
+ assertEquals("testName", customer2.getName());
}
@Test
@@ -92,10 +94,10 @@ public class SoapCxfClientTest extends RouteBuilder {
request.setName("none");
try {
customerService.getCustomersByName(request);
- Assert.fail("NoSuchCustomerException expected");
+ fail("NoSuchCustomerException expected");
} catch (NoSuchCustomerException e) {
NoSuchCustomer info = e.getFaultInfo();
- Assert.assertEquals("none", info.getCustomerId());
+ assertEquals("none", info.getCustomerId());
}
}
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
index 1e1adea..4bca9a2 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
@@ -28,17 +28,19 @@ import org.apache.camel.Produce;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy;
-import org.junit.Assert;
-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;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Checks for interoperability between a CXF server that is attached using
* the Camel transport for CXF and a dynamic proxy using the SOAP data format
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class SoapCxfServerTest extends RouteBuilder {
@Produce("direct:camelClient")
@@ -49,10 +51,10 @@ public class SoapCxfServerTest extends RouteBuilder {
GetCustomersByName request = new GetCustomersByName();
request.setName("test");
GetCustomersByNameResponse response = customerServiceProxy.getCustomersByName(request);
- Assert.assertNotNull(response);
+ assertNotNull(response);
List<Customer> customers = response.getReturn();
- Assert.assertEquals(1, customers.size());
- Assert.assertEquals("test", customers.get(0).getName());
+ assertEquals(1, customers.size());
+ assertEquals("test", customers.get(0).getName());
}
@Test
@@ -61,10 +63,10 @@ public class SoapCxfServerTest extends RouteBuilder {
request.setName("none");
try {
customerServiceProxy.getCustomersByName(request);
- Assert.fail("NoSuchCustomerException expected");
+ fail("NoSuchCustomerException expected");
} catch (NoSuchCustomerException e) {
NoSuchCustomer info = e.getFaultInfo();
- Assert.assertEquals("none", info.getCustomerId());
+ assertEquals("none", info.getCustomerId());
}
}
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
index 83c50ee..23d401b 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
@@ -30,8 +30,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-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 SoapMarshalTest extends CamelTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
index 0b6c869..3095cdc 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
@@ -27,8 +27,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-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 SoapRoundtripTest extends CamelTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
index 5a41d72..8f90ead 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
@@ -25,8 +25,10 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-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;
/*
* Checks the soap data format by using fixed request and expected response
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
index 1a3d957..21b1693 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
@@ -24,16 +24,17 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
-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;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Works like SoapRoundTripTest but uses a spring configuration instead of the java dsl
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class SoapSpringRoundtripTest {
@@ -53,7 +54,7 @@ public class SoapSpringRoundtripTest {
Exchange exchange = resultEndpoint.getExchanges().get(0);
GetCustomersByName received = exchange.getIn().getBody(
GetCustomersByName.class);
- Assert.assertNotNull(received);
- Assert.assertEquals("Mueller", received.getName());
+ assertNotNull(received);
+ assertEquals("Mueller", received.getName());
}
}
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
index 6c7062a..eda9fd0 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
@@ -28,17 +28,19 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SoapToSoapDontIgnoreTest extends CamelTestSupport {
private static SoapJaxbDataFormat soapjaxbModel;
private static SoapJaxbDataFormat soapjaxbModelDontIgnoreUnmarshalled;
private static Map<String, String> namespacePrefixMap;
- @BeforeClass
+ @BeforeAll
public static void setup() {
namespacePrefixMap = new HashMap<>();
namespacePrefixMap.put("http://schemas.xmlsoap.org/soap/envelope/", "soap");
@@ -60,7 +62,7 @@ public class SoapToSoapDontIgnoreTest extends CamelTestSupport {
soapjaxbModelDontIgnoreUnmarshalled.setElementNameStrategy(new TypeNameStrategy());
}
- @AfterClass
+ @AfterAll
public static void teardown() {
soapjaxbModel = null;
namespacePrefixMap = null;
@@ -79,8 +81,9 @@ public class SoapToSoapDontIgnoreTest extends CamelTestSupport {
byte[] body = (byte[])result.getIn().getBody();
InputStream stream = new ByteArrayInputStream(body);
SOAPMessage request = MessageFactory.newInstance().createMessage(null, stream);
- assertTrue("Expected headers", null != request.getSOAPHeader()
- && request.getSOAPHeader().extractAllHeaderElements().hasNext());
+ assertTrue(null != request.getSOAPHeader()
+ && request.getSOAPHeader().extractAllHeaderElements().hasNext(),
+ "Expected headers");
}
private InputStream createRequest() throws Exception {
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
index 1dfb55a..51554b7 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
@@ -28,17 +28,19 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SoapToSoapIgnoreTest extends CamelTestSupport {
private static SoapJaxbDataFormat soapjaxbModel;
private static SoapJaxbDataFormat soapjaxbModelIgnoreUnmarshalled;
private static Map<String, String> namespacePrefixMap;
- @BeforeClass
+ @BeforeAll
public static void setup() {
namespacePrefixMap = new HashMap<>();
namespacePrefixMap.put("http://schemas.xmlsoap.org/soap/envelope/", "soap");
@@ -60,7 +62,7 @@ public class SoapToSoapIgnoreTest extends CamelTestSupport {
soapjaxbModelIgnoreUnmarshalled.setElementNameStrategy(new TypeNameStrategy());
}
- @AfterClass
+ @AfterAll
public static void teardown() {
soapjaxbModel = null;
namespacePrefixMap = null;
@@ -79,8 +81,9 @@ public class SoapToSoapIgnoreTest extends CamelTestSupport {
byte[] body = (byte[])result.getIn().getBody();
InputStream stream = new ByteArrayInputStream(body);
SOAPMessage request = MessageFactory.newInstance().createMessage(null, stream);
- assertTrue("Expected no headers", null == request.getSOAPHeader()
- || !request.getSOAPHeader().extractAllHeaderElements().hasNext());
+ assertTrue(null == request.getSOAPHeader()
+ || !request.getSOAPHeader().extractAllHeaderElements().hasNext(),
+ "Expected no headers");
}
private InputStream createRequest() throws Exception {
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
index 402bc24..b1d9eb3 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
@@ -28,16 +28,18 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SoapToSoapSingleDataFormatterTest extends CamelTestSupport {
private static SoapJaxbDataFormat soapjaxbModel;
private static Map<String, String> namespacePrefixMap;
- @BeforeClass
+ @BeforeAll
public static void setup() {
namespacePrefixMap = new HashMap<>();
namespacePrefixMap.put("http://schemas.xmlsoap.org/soap/envelope/", "soap");
@@ -53,7 +55,7 @@ public class SoapToSoapSingleDataFormatterTest extends CamelTestSupport {
soapjaxbModel.setElementNameStrategy(new TypeNameStrategy());
}
- @AfterClass
+ @AfterAll
public static void teardown() {
soapjaxbModel = null;
namespacePrefixMap = null;
@@ -72,8 +74,9 @@ public class SoapToSoapSingleDataFormatterTest extends CamelTestSupport {
byte[] body = (byte[])result.getIn().getBody();
InputStream stream = new ByteArrayInputStream(body);
SOAPMessage request = MessageFactory.newInstance().createMessage(null, stream);
- assertTrue("Expected headers", null != request.getSOAPHeader()
- && request.getSOAPHeader().extractAllHeaderElements().hasNext());
+ assertTrue(null != request.getSOAPHeader()
+ && request.getSOAPHeader().extractAllHeaderElements().hasNext(),
+ "Expected headers");
}
private InputStream createRequest() throws Exception {
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
index 70cf788..0b1cba9 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
@@ -28,8 +28,11 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Checks that a static soap request is unmarshalled to the correct java
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java
index 0891e27..835b97b 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java
@@ -32,8 +32,8 @@ import org.apache.camel.dataformat.soap.SoapJaxbDataFormat;
import org.apache.camel.dataformat.soap.TestUtil;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-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 Soap12MarshalTest extends CamelTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java
index cd51a92..33daa04 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java
@@ -24,16 +24,17 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
-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;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Works like SoapRoundTripTest but uses a spring configuration instead of the java dsl
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class Soap12SpringRoundtripTest {
@@ -53,7 +54,7 @@ public class Soap12SpringRoundtripTest {
Exchange exchange = resultEndpoint.getExchanges().get(0);
GetCustomersByName received = exchange.getIn().getBody(
GetCustomersByName.class);
- Assert.assertNotNull(received);
- Assert.assertEquals("Mueller", received.getName());
+ assertNotNull(received);
+ assertEquals("Mueller", received.getName());
}
}
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
index dfe7eec..8d61449 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
@@ -28,8 +28,11 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Checks that a static soap request is unmarshalled to the correct java
[camel] 20/27: [CAMEL-11807] Upgrade camel-twitter 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 a6a5a129fefde48b8da4ee604b8089524bb45edb
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 12:30:06 2020 +0200
[CAMEL-11807] Upgrade camel-twitter to junit5
---
components/camel-twitter/pom.xml | 11 ++++++--
.../AbstractComponentVerifierExtensionTest.java | 33 +++++++++++-----------
.../twitter/AbstractComponentVerifierTest.java | 31 ++++++++++----------
.../twitter/CamelTwitterConsumerTestSupport.java | 2 +-
.../component/twitter/CamelTwitterTestSupport.java | 5 +++-
.../component/twitter/DirectMessageDirectTest.java | 4 +--
.../twitter/DirectMessagePollingTest.java | 4 +--
.../twitter/DirectMessageProducerTest.java | 4 ++-
.../twitter/SearchByExchangeDirectTest.java | 4 ++-
.../component/twitter/UriConfigurationTest.java | 26 +++++++++--------
.../component/twitter/UserProducerInOnlyTest.java | 4 ++-
.../component/twitter/UserProducerInOutTest.java | 4 ++-
...witterSearchComponentVerifierExtensionTest.java | 23 ++++++++-------
.../search/TwitterSearchComponentVerifierTest.java | 23 ++++++++-------
14 files changed, 102 insertions(+), 76 deletions(-)
diff --git a/components/camel-twitter/pom.xml b/components/camel-twitter/pom.xml
index d4df314..4f5618a 100644
--- a/components/camel-twitter/pom.xml
+++ b/components/camel-twitter/pom.xml
@@ -49,12 +49,12 @@
<!-- 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>
@@ -62,6 +62,11 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierExtensionTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierExtensionTest.java
index 5294ae2..cd97b148 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierExtensionTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierExtensionTest.java
@@ -20,8 +20,9 @@ import java.util.Map;
import org.apache.camel.Component;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public abstract class AbstractComponentVerifierExtensionTest extends CamelTwitterTestSupport {
@@ -34,13 +35,13 @@ public abstract class AbstractComponentVerifierExtensionTest extends CamelTwitte
@Test
public void testConnectivity() {
- Component component = context().getComponent(getComponentScheme());
+ Component component = context.getComponent(getComponentScheme());
ComponentVerifierExtension verifier = component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
Map<String, Object> parameters = getParameters();
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
@Test
@@ -53,11 +54,11 @@ public abstract class AbstractComponentVerifierExtensionTest extends CamelTwitte
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION, result.getErrors().get(0).getCode());
- Assert.assertEquals(401, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
- Assert.assertEquals(32, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION, result.getErrors().get(0).getCode());
+ assertEquals(401, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
+ assertEquals(32, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
}
@Test
@@ -70,12 +71,12 @@ public abstract class AbstractComponentVerifierExtensionTest extends CamelTwitte
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION, result.getErrors().get(0).getCode());
- Assert.assertEquals(401, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
- Assert.assertEquals(89, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
- Assert.assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
- Assert.assertEquals("accessToken", result.getErrors().get(0).getParameterKeys().iterator().next());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION, result.getErrors().get(0).getCode());
+ assertEquals(401, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
+ assertEquals(89, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
+ assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
+ assertEquals("accessToken", result.getErrors().get(0).getParameterKeys().iterator().next());
}
}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierTest.java
index b937d74..579c884 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/AbstractComponentVerifierTest.java
@@ -19,8 +19,9 @@ package org.apache.camel.component.twitter;
import java.util.Map;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public abstract class AbstractComponentVerifierTest extends CamelTwitterTestSupport {
@@ -39,7 +40,7 @@ public abstract class AbstractComponentVerifierTest extends CamelTwitterTestSupp
Map<String, Object> parameters = getParameters();
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
@Test
@@ -52,11 +53,11 @@ public abstract class AbstractComponentVerifierTest extends CamelTwitterTestSupp
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION, result.getErrors().get(0).getCode());
- Assert.assertEquals(401, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
- Assert.assertEquals(32, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION, result.getErrors().get(0).getCode());
+ assertEquals(401, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
+ assertEquals(32, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
}
@Test
@@ -69,12 +70,12 @@ public abstract class AbstractComponentVerifierTest extends CamelTwitterTestSupp
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION, result.getErrors().get(0).getCode());
- Assert.assertEquals(401, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
- Assert.assertEquals(89, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
- Assert.assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
- Assert.assertEquals("accessToken", result.getErrors().get(0).getParameterKeys().iterator().next());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.AUTHENTICATION, result.getErrors().get(0).getCode());
+ assertEquals(401, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_status_code")));
+ assertEquals(89, result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.asAttribute("twitter_error_code")));
+ assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
+ assertEquals("accessToken", result.getErrors().get(0).getParameterKeys().iterator().next());
}
}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterConsumerTestSupport.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterConsumerTestSupport.java
index cf557b8..8d07eb1 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterConsumerTestSupport.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterConsumerTestSupport.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
public abstract class CamelTwitterConsumerTestSupport extends CamelTwitterTestSupport {
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterTestSupport.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterTestSupport.java
index f40cfd8..47b4f62 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterTestSupport.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/CamelTwitterTestSupport.java
@@ -23,11 +23,14 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CamelTwitterTestSupport extends CamelTestSupport {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
protected String consumerKey;
protected String consumerSecret;
protected String accessToken;
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageDirectTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageDirectTest.java
index 89d33de..6b8bb66d 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageDirectTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageDirectTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.twitter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
public class DirectMessageDirectTest extends CamelTwitterConsumerTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
/* Uncomment when you need a test direct message
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessagePollingTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessagePollingTest.java
index f5f49f4..6ffafe3 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessagePollingTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessagePollingTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.twitter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
*/
public class DirectMessagePollingTest extends CamelTwitterConsumerTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
/* Uncomment when you need a test direct message
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java
index c19c5d4..5c9017b 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java
@@ -24,11 +24,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Tests posting a twitter update with the default In Message Exchange Pattern
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java
index 080dc05..7431cea 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java
@@ -25,7 +25,9 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
index a891f61..8f02df9 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
@@ -23,10 +23,12 @@ import org.apache.camel.component.twitter.directmessage.TwitterDirectMessageEndp
import org.apache.camel.component.twitter.search.TwitterSearchEndpoint;
import org.apache.camel.component.twitter.timeline.TwitterTimelineEndpoint;
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 {
private CamelContext context = new DefaultCamelContext();
private CamelTwitterTestSupport support = new CamelTwitterTestSupport();
@@ -34,7 +36,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testBasicAuthentication() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-search:foo?" + support.getUriTokens());
- assertTrue("Endpoint not a TwitterSearchEndpoint: " + endpoint, endpoint instanceof TwitterSearchEndpoint);
+ assertTrue(endpoint instanceof TwitterSearchEndpoint, "Endpoint not a TwitterSearchEndpoint: " + endpoint);
TwitterSearchEndpoint twitterEndpoint = (TwitterSearchEndpoint) endpoint;
assertTrue(!twitterEndpoint.getProperties().getConsumerKey().isEmpty());
@@ -46,7 +48,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testPageSetting() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-search:foo?count=50&numberOfPages=2");
- assertTrue("Endpoint not a TwitterSearchEndpoint: " + endpoint, endpoint instanceof TwitterSearchEndpoint);
+ assertTrue(endpoint instanceof TwitterSearchEndpoint, "Endpoint not a TwitterSearchEndpoint: " + endpoint);
TwitterSearchEndpoint twitterEndpoint = (TwitterSearchEndpoint) endpoint;
assertEquals(new Integer(50), twitterEndpoint.getProperties().getCount());
@@ -56,7 +58,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testHttpProxySetting() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-search:foo?httpProxyHost=example.com&httpProxyPort=3338&httpProxyUser=test&httpProxyPassword=pwd");
- assertTrue("Endpoint not a TwitterSearchEndpoint: " + endpoint, endpoint instanceof TwitterSearchEndpoint);
+ assertTrue(endpoint instanceof TwitterSearchEndpoint, "Endpoint not a TwitterSearchEndpoint: " + endpoint);
TwitterSearchEndpoint twitterEndpoint = (TwitterSearchEndpoint) endpoint;
assertEquals("example.com", twitterEndpoint.getProperties().getHttpProxyHost());
@@ -68,31 +70,31 @@ public class UriConfigurationTest extends Assert {
@Test
public void testDirectMessageEndpoint() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-directmessage:foo");
- assertTrue("Endpoint not a TwitterDirectMessageEndpoint: " + endpoint, endpoint instanceof TwitterDirectMessageEndpoint);
+ assertTrue(endpoint instanceof TwitterDirectMessageEndpoint, "Endpoint not a TwitterDirectMessageEndpoint: " + endpoint);
}
@Test
public void testSearchEndpoint() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-search:foo");
- assertTrue("Endpoint not a TwitterSearchEndpoint: " + endpoint, endpoint instanceof TwitterSearchEndpoint);
+ assertTrue(endpoint instanceof TwitterSearchEndpoint, "Endpoint not a TwitterSearchEndpoint: " + endpoint);
}
@Test
public void testTimelineEndpoint() throws Exception {
Endpoint endpoint = context.getEndpoint("twitter-timeline:home");
- assertTrue("Endpoint not a TwitterTimelineEndpoint: " + endpoint, endpoint instanceof TwitterTimelineEndpoint);
+ assertTrue(endpoint instanceof TwitterTimelineEndpoint, "Endpoint not a TwitterTimelineEndpoint: " + endpoint);
TwitterTimelineEndpoint timelineEndpoint = (TwitterTimelineEndpoint)endpoint;
assertEquals(TimelineType.HOME, timelineEndpoint.getTimelineType());
endpoint = context.getEndpoint("twitter-timeline:mentions");
- assertTrue("Endpoint not a TwitterTimelineEndpoint: " + endpoint, endpoint instanceof TwitterTimelineEndpoint);
+ assertTrue(endpoint instanceof TwitterTimelineEndpoint, "Endpoint not a TwitterTimelineEndpoint: " + endpoint);
timelineEndpoint = (TwitterTimelineEndpoint)endpoint;
assertEquals(TimelineType.MENTIONS, timelineEndpoint.getTimelineType());
endpoint = context.getEndpoint("twitter-timeline:retweetsofme");
- assertTrue("Endpoint not a TwitterTimelineEndpoint: " + endpoint, endpoint instanceof TwitterTimelineEndpoint);
+ assertTrue(endpoint instanceof TwitterTimelineEndpoint, "Endpoint not a TwitterTimelineEndpoint: " + endpoint);
timelineEndpoint = (TwitterTimelineEndpoint)endpoint;
assertEquals(TimelineType.RETWEETSOFME, timelineEndpoint.getTimelineType());
endpoint = context.getEndpoint("twitter-timeline:user");
- assertTrue("Endpoint not a TwitterTimelineEndpoint: " + endpoint, endpoint instanceof TwitterTimelineEndpoint);
+ assertTrue(endpoint instanceof TwitterTimelineEndpoint, "Endpoint not a TwitterTimelineEndpoint: " + endpoint);
timelineEndpoint = (TwitterTimelineEndpoint)endpoint;
assertEquals(TimelineType.USER, timelineEndpoint.getTimelineType());
}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java
index 4ec68b2..7b4bace 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java
@@ -24,11 +24,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Tests posting a twitter update with the default In Message Exchange Pattern
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
index dc52b27..6416d60 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java
@@ -24,12 +24,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import twitter4j.Status;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Tests posting a twitter update and getting the status update id from the Twitter API response
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierExtensionTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierExtensionTest.java
index 2890762..65f3a88 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierExtensionTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierExtensionTest.java
@@ -23,8 +23,11 @@ import java.util.List;
import org.apache.camel.Component;
import org.apache.camel.component.extension.ComponentVerifierExtension;
import org.apache.camel.component.twitter.AbstractComponentVerifierExtensionTest;
-import org.junit.Assert;
-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.assertTrue;
public class TwitterSearchComponentVerifierExtensionTest extends AbstractComponentVerifierExtensionTest {
@Override
@@ -41,8 +44,8 @@ public class TwitterSearchComponentVerifierExtensionTest extends AbstractCompone
// Parameters validation
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, Collections.emptyMap());
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(5, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(5, result.getErrors().size());
List<String> expected = new LinkedList<>();
expected.add("keywords");
@@ -55,18 +58,18 @@ public class TwitterSearchComponentVerifierExtensionTest extends AbstractCompone
expected.removeAll(error.getParameterKeys());
}
- Assert.assertTrue("Missing expected params: " + expected.toString(), expected.isEmpty());
+ assertTrue(expected.isEmpty(), "Missing expected params: " + expected.toString());
}
{
// Connectivity validation
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, Collections.emptyMap());
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION, result.getErrors().get(0).getCode());
- Assert.assertNotNull(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE));
- Assert.assertTrue(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE) instanceof IllegalArgumentException);
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION, result.getErrors().get(0).getCode());
+ assertNotNull(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE));
+ assertTrue(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE) instanceof IllegalArgumentException);
}
}
}
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierTest.java
index 6cb9946..ab6c9fe 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/search/TwitterSearchComponentVerifierTest.java
@@ -23,8 +23,11 @@ import java.util.List;
import org.apache.camel.component.extension.ComponentVerifierExtension;
import org.apache.camel.component.twitter.AbstractComponentVerifierTest;
import org.apache.camel.component.twitter.AbstractTwitterComponent;
-import org.junit.Assert;
-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.assertTrue;
public class TwitterSearchComponentVerifierTest extends AbstractComponentVerifierTest {
@Override
@@ -41,8 +44,8 @@ public class TwitterSearchComponentVerifierTest extends AbstractComponentVerifie
// Parameters validation
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, Collections.emptyMap());
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(5, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(5, result.getErrors().size());
List<String> expected = new LinkedList<>();
expected.add("keywords");
@@ -55,18 +58,18 @@ public class TwitterSearchComponentVerifierTest extends AbstractComponentVerifie
expected.removeAll(error.getParameterKeys());
}
- Assert.assertTrue("Missing expected params: " + expected.toString(), expected.isEmpty());
+ assertTrue(expected.isEmpty(), "Missing expected params: " + expected.toString());
}
{
// Connectivity validation
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, Collections.emptyMap());
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION, result.getErrors().get(0).getCode());
- Assert.assertNotNull(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE));
- Assert.assertTrue(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE) instanceof IllegalArgumentException);
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION, result.getErrors().get(0).getCode());
+ assertNotNull(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE));
+ assertTrue(result.getErrors().get(0).getDetails().get(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE) instanceof IllegalArgumentException);
}
}
}
[camel] 26/27: [CAMEL-11807] Upgrade camel-weka 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 274749fdde672bdb53b49a34981f100bb7091dc8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 16:20:26 2020 +0200
[CAMEL-11807] Upgrade camel-weka to junit5
---
components/camel-weka/pom.xml | 4 ++--
.../camel/component/weka/DecisionTreeTest.java | 17 +++++++--------
.../apache/camel/component/weka/FilterTest.java | 13 ++++++------
.../camel/component/weka/PredictionTest.java | 7 ++++---
.../apache/camel/component/weka/ReadWriteTest.java | 24 ++++++++++++----------
5 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/components/camel-weka/pom.xml b/components/camel-weka/pom.xml
index d2f489a..620289b 100644
--- a/components/camel-weka/pom.xml
+++ b/components/camel-weka/pom.xml
@@ -56,8 +56,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-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java b/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java
index ee79c22..aec4a88 100644
--- a/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java
+++ b/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java
@@ -25,11 +25,12 @@ 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.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import weka.classifiers.Classifier;
import weka.classifiers.Evaluation;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class DecisionTreeTest extends AbstractWekaTest {
@Test
@@ -60,11 +61,11 @@ public class DecisionTreeTest extends AbstractWekaTest {
Dataset dataset = producer.requestBody("direct:start", inpath, Dataset.class);
Classifier classifier = dataset.getClassifier();
- Assert.assertNotNull(classifier);
+ assertNotNull(classifier);
logInfo("{}", classifier);
Evaluation evaluation = dataset.getEvaluation();
- Assert.assertNotNull(evaluation);
+ assertNotNull(evaluation);
logInfo("{}", evaluation);
}
}
@@ -97,11 +98,11 @@ public class DecisionTreeTest extends AbstractWekaTest {
Dataset dataset = producer.requestBody("direct:start", inpath, Dataset.class);
Classifier classifier = dataset.getClassifier();
- Assert.assertNotNull(classifier);
+ assertNotNull(classifier);
logInfo("{}", classifier);
Evaluation evaluation = dataset.getEvaluation();
- Assert.assertNotNull(evaluation);
+ assertNotNull(evaluation);
logInfo("{}", evaluation);
}
}
@@ -131,11 +132,11 @@ public class DecisionTreeTest extends AbstractWekaTest {
Dataset dataset = producer.requestBody("direct:start", inpath, Dataset.class);
Classifier classifier = dataset.getClassifier();
- Assert.assertNotNull(classifier);
+ assertNotNull(classifier);
logInfo("{}", classifier);
Evaluation evaluation = dataset.getEvaluation();
- Assert.assertNotNull(evaluation);
+ assertNotNull(evaluation);
logInfo("{}", evaluation);
}
}
diff --git a/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java b/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java
index 5275dc5..0d209ef 100644
--- a/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java
+++ b/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java
@@ -26,10 +26,11 @@ import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import weka.core.Instances;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class FilterTest {
@Test
@@ -64,10 +65,10 @@ public class FilterTest {
ConsumerTemplate consumer = camelctx.createConsumerTemplate();
Dataset dataset = consumer.receiveBody("direct:end", Dataset.class);
- Assert.assertEquals("sfny", dataset.getInstances().relationName());
+ assertEquals("sfny", dataset.getInstances().relationName());
Instances instances = DatasetUtils.read("target/data/sfny.arff");
- Assert.assertEquals("sfny", instances.relationName());
+ assertEquals("sfny", instances.relationName());
}
}
@@ -103,10 +104,10 @@ public class FilterTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", inpath, Dataset.class);
- Assert.assertEquals("sfny", dataset.getInstances().relationName());
+ assertEquals("sfny", dataset.getInstances().relationName());
Instances instances = DatasetUtils.read("target/data/sfny.arff");
- Assert.assertEquals("sfny", instances.relationName());
+ assertEquals("sfny", instances.relationName());
}
}
}
diff --git a/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java b/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java
index 574e203..7ad5bd4 100644
--- a/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java
+++ b/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java
@@ -28,10 +28,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import weka.core.Instances;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class PredictionTest extends AbstractWekaTest {
@Test
@@ -93,7 +94,7 @@ public class PredictionTest extends AbstractWekaTest {
logInfo(String.format("Correctly Classified Instances %d %.4f %%", correct, accuracy));
logInfo(String.format("Incorrectly Classified Instances %d %.4f %%", incorrect, 100 - accuracy));
- Assert.assertEquals("88.8889", String.format(Locale.ENGLISH, "%.4f", accuracy));
+ assertEquals("88.8889", String.format(Locale.ENGLISH, "%.4f", accuracy));
}
}
diff --git a/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java b/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java
index 8e6eefd..f0d2021 100644
--- a/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java
+++ b/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java
@@ -27,8 +27,10 @@ import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ReadWriteTest {
@@ -48,7 +50,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
String res = producer.requestBody("direct:start", null, String.class);
- Assert.assertTrue(res.startsWith("3.8"));
+ assertTrue(res.startsWith("3.8"));
}
}
@@ -69,7 +71,7 @@ public class ReadWriteTest {
ConsumerTemplate consumer = camelctx.createConsumerTemplate();
Dataset dataset = consumer.receiveBody("direct:end", Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -92,7 +94,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", sourceUrl, Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -115,7 +117,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", input, Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -135,7 +137,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", null, Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -158,7 +160,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", input, Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -184,7 +186,7 @@ public class ReadWriteTest {
Path outpath = Paths.get("target/data/sfny.arff");
dataset = Dataset.create(outpath);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -211,7 +213,7 @@ public class ReadWriteTest {
Path outpath = Paths.get("target/data/sfny.arff");
dataset = Dataset.create(outpath);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -237,7 +239,7 @@ public class ReadWriteTest {
Path outpath = Paths.get("target/data/sfny.arff");
dataset = Dataset.create(outpath);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
}
[camel] 11/27: [CAMEL-11807] Upgrade camel-spring-ws 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 b81a76f26100b8c3b1f51c530732a460981b586c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 11:37:56 2020 +0200
[CAMEL-11807] Upgrade camel-spring-ws to junit5
---
components/camel-spring-ws/pom.xml | 6 +--
.../spring/ws/ConsumerBreadcrumbIdTest.java | 20 ++++-----
...ConsumerEndpointMappingByBeanNameRouteTest.java | 10 +++--
...erEndpointMappingResponseHandlingRouteTest.java | 10 +++--
.../ws/ConsumerEndpointMappingRouteTest.java | 26 +++++++-----
.../ws/ConsumerExceptionPropagationRouteTest.java | 20 ++++-----
.../spring/ws/ConsumerMarshallingRouteTest.java | 18 +++++----
.../ws/MessageFilterResolvingDefaultsTest.java | 11 +++--
.../spring/ws/MessageFilterResolvingTest.java | 11 +++--
.../spring/ws/ProducerLocalRouteTest.java | 14 ++++---
.../spring/ws/ProducerRemoteRouteTest.java | 23 ++++++-----
.../spring/ws/ProducerRemoteRouteTimeOutTest.java | 16 ++++----
.../camel/component/spring/ws/SoapHeaderTest.java | 12 +++---
.../spring/ws/SoapResponseAttachmentTest.java | 6 ++-
.../ws/addressing/AbstractConsumerTests.java | 12 +++---
.../spring/ws/addressing/AbstractWSATests.java | 47 ++++------------------
.../ws/addressing/CamelDirectSenderTest.java | 10 +++--
.../ConsumerWSAEndpointMappingRouteTest.java | 20 +++++----
.../ConsumerWSANewChannelParamsActionTests.java | 2 +
.../ConsumerWSANewChannelParamsToTests.java | 2 +
.../ConsumerWSASameChannelParamsActionTests.java | 2 +
.../ConsumerWSASameChannelParamsToTests.java | 2 +
.../ws/addressing/ProducerParamsBasicTest.java | 14 ++++---
.../addressing/ProducerParamsPrecedenceTest.java | 20 ++++-----
.../ws/filter/impl/BasicMessageFilterTest.java | 11 ++---
.../security/ProducerWss4JSecurityHeaderTest.java | 16 +++++---
.../camel/component/spring/ws/utils/TestUtil.java | 8 ++--
27 files changed, 192 insertions(+), 177 deletions(-)
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index adff057..db44504 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -138,7 +138,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -164,8 +164,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-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
index 32f2d25..64a9f56 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
@@ -24,19 +24,21 @@ import org.apache.camel.component.spring.ws.jaxb.QuoteRequest;
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+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.SpringJUnit4ClassRunner;
import org.springframework.ws.client.core.WebServiceTemplate;
-@Ignore("TODO: investigate for Camel 3.0")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("TODO: investigate for Camel 3.0")
@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
public class ConsumerBreadcrumbIdTest extends CamelTestSupport {
@Autowired
@@ -46,7 +48,7 @@ public class ConsumerBreadcrumbIdTest extends CamelTestSupport {
private WebServiceTemplate webServiceTemplate;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
context.setTracing(true);
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java
index b45b1d9..a105fec 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java
@@ -23,13 +23,15 @@ import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.apache.camel.component.spring.ws.utils.TestUtil;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.client.core.WebServiceTemplate;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ConsumerEndpointMappingByBeanNameRouteTest extends CamelSpringTestSupport {
private final String xmlRequestForGoogleStockQuote = "<GetQuote xmlns=\"http://www.stockquotes.edu/\"><symbol>GOOG</symbol></GetQuote>";
@@ -38,7 +40,7 @@ public class ConsumerEndpointMappingByBeanNameRouteTest extends CamelSpringTestS
private WebServiceTemplate webServiceTemplate;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
webServiceTemplate = applicationContext.getBean("webServiceTemplate", WebServiceTemplate.class);
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java
index ddc113a..1543583 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java
@@ -25,9 +25,9 @@ import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.apache.camel.component.spring.ws.utils.TestUtil;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.client.core.WebServiceTemplate;
@@ -35,6 +35,8 @@ import org.springframework.ws.soap.addressing.client.ActionCallback;
import org.springframework.ws.soap.addressing.version.Addressing10;
import org.springframework.ws.soap.client.core.SoapActionCallback;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ConsumerEndpointMappingResponseHandlingRouteTest extends CamelSpringTestSupport {
private final String xmlRequestForGoogleStockQuote = "<GetQuote xmlns=\"http://www.webserviceX.NET/\"><symbol>GOOG</symbol></GetQuote>";
@@ -45,7 +47,7 @@ public class ConsumerEndpointMappingResponseHandlingRouteTest extends CamelSprin
private WebServiceTemplate webServiceTemplate;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
webServiceTemplate = applicationContext.getBean("webServiceTemplate", WebServiceTemplate.class);
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java
index bce624b..9009af3 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java
@@ -25,9 +25,9 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.client.WebServiceIOException;
@@ -35,6 +35,8 @@ import org.springframework.ws.client.core.SourceExtractor;
import org.springframework.ws.client.core.WebServiceTemplate;
import org.springframework.ws.soap.client.core.SoapActionCallback;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class ConsumerEndpointMappingRouteTest extends CamelSpringTestSupport {
private static final SourceExtractor<Object> NOOP_SOURCE_EXTRACTOR = new SourceExtractor<Object>() {
@@ -65,7 +67,7 @@ public class ConsumerEndpointMappingRouteTest extends CamelSpringTestSupport {
private WebServiceTemplate webServiceTemplate;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
webServiceTemplate = applicationContext.getBean("webServiceTemplate", WebServiceTemplate.class);
@@ -86,10 +88,12 @@ public class ConsumerEndpointMappingRouteTest extends CamelSpringTestSupport {
resultEndpointSoapAction.assertIsSatisfied();
}
- @Test(expected = WebServiceIOException.class)
+ @Test
public void testWrongSoapAction() throws Exception {
- webServiceTemplate.sendSourceAndReceive(getDefaultXmlRequestSource(), new SoapActionCallback("http://this-is-a-wrong-soap-action"), NOOP_SOURCE_EXTRACTOR);
- resultEndpointSoapAction.assertIsNotSatisfied();
+ assertThrows(WebServiceIOException.class, () -> {
+ webServiceTemplate.sendSourceAndReceive(getDefaultXmlRequestSource(), new SoapActionCallback("http://this-is-a-wrong-soap-action"), NOOP_SOURCE_EXTRACTOR);
+ resultEndpointSoapAction.assertIsNotSatisfied();
+ });
}
@Test
@@ -127,10 +131,12 @@ public class ConsumerEndpointMappingRouteTest extends CamelSpringTestSupport {
resultEndpointUriPath.assertIsSatisfied();
}
- @Test(expected = WebServiceIOException.class)
+ @Test
public void testWrongUri() throws Exception {
- webServiceTemplate.sendSourceAndReceive("http://localhost/wrong", getDefaultXmlRequestSource(), NOOP_SOURCE_EXTRACTOR);
- resultEndpointUri.assertIsNotSatisfied();
+ assertThrows(WebServiceIOException.class, () -> {
+ webServiceTemplate.sendSourceAndReceive("http://localhost/wrong", getDefaultXmlRequestSource(), NOOP_SOURCE_EXTRACTOR);
+ resultEndpointUri.assertIsNotSatisfied();
+ });
}
@Override
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java
index 25b7744..43081bb 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest.java
@@ -26,22 +26,23 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.spring.ws.bean.CamelEndpointMapping;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.ws.test.server.MockWebServiceClient;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.springframework.ws.test.server.RequestCreators.withPayload;
import static org.springframework.ws.test.server.ResponseMatchers.serverOrReceiverFault;
@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
public class ConsumerExceptionPropagationRouteTest extends CamelTestSupport {
private final String xmlRequestForGoogleStockQuote = "<GetQuote xmlns=\"http://www.webserviceX.NET/\"><symbol>GOOG</symbol></GetQuote>";
@@ -54,11 +55,12 @@ public class ConsumerExceptionPropagationRouteTest extends CamelTestSupport {
private MockWebServiceClient mockClient;
- @Before
+ @BeforeEach
public void createClient() {
mockClient = MockWebServiceClient.createClient(applicationContext);
}
+ @BeforeEach
@Override
public void setUp() throws Exception {
super.setUp();
@@ -72,7 +74,7 @@ public class ConsumerExceptionPropagationRouteTest extends CamelTestSupport {
return registry;
}
- @Ignore("For now getEndpointUri does not return the initial uri. Info like the endpoint scheme is lost")
+ @Disabled("For now getEndpointUri does not return the initial uri. Info like the endpoint scheme is lost")
@Test
public void testValidUri() throws Exception {
String deprecate = "spring-ws:rootqname:{http://www.webserviceX.NET/}GetQuote?endpointMapping=#endpointMapping";
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java
index 014f523..715bff0 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerMarshallingRouteTest.java
@@ -24,17 +24,21 @@ import org.apache.camel.component.spring.ws.jaxb.QuoteResponse;
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.BeforeEach;
+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.SpringJUnit4ClassRunner;
import org.springframework.ws.client.core.WebServiceTemplate;
+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;
+
@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
public class ConsumerMarshallingRouteTest extends CamelTestSupport {
@Autowired
@@ -44,7 +48,7 @@ public class ConsumerMarshallingRouteTest extends CamelTestSupport {
private WebServiceTemplate webServiceTemplate;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
context.setTracing(true);
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingDefaultsTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingDefaultsTest.java
index 57cce8b..3c42a94 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingDefaultsTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingDefaultsTest.java
@@ -23,13 +23,12 @@ import javax.xml.namespace.QName;
import net.javacrumbs.smock.springws.client.AbstractSmockClientTest;
import org.apache.camel.ProducerTemplate;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.ws.WebServiceMessage;
import org.springframework.ws.test.client.RequestMatcher;
@@ -37,7 +36,7 @@ import org.springframework.ws.test.client.RequestMatcher;
* Check if the MessageFilter is used and resolved from endpoint uri or global
* context configuration.
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration(locations = {"classpath:org/apache/camel/component/spring/ws/DefaultMessageFilter-context.xml"})
public class MessageFilterResolvingDefaultsTest extends AbstractSmockClientTest {
@@ -76,7 +75,7 @@ public class MessageFilterResolvingDefaultsTest extends AbstractSmockClientTest
}
@Override
- @After
+ @AfterEach
public void verify() {
super.verify();
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingTest.java
index 2e7445d..ba028ec 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/MessageFilterResolvingTest.java
@@ -23,13 +23,12 @@ import javax.xml.namespace.QName;
import net.javacrumbs.smock.springws.client.AbstractSmockClientTest;
import org.apache.camel.ProducerTemplate;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.ws.WebServiceMessage;
import org.springframework.ws.test.client.RequestMatcher;
@@ -37,7 +36,7 @@ import org.springframework.ws.test.client.RequestMatcher;
* Check if the MessageFilter is used and resolved from endpoint uri or global
* context configuration.
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration(locations = {"classpath:org/apache/camel/component/spring/ws/MessageFilter-context.xml"})
public class MessageFilterResolvingTest extends AbstractSmockClientTest {
@Autowired
@@ -89,7 +88,7 @@ public class MessageFilterResolvingTest extends AbstractSmockClientTest {
}
@Override
- @After
+ @AfterEach
public void verify() {
super.verify();
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java
index b509ee3..f7cd94a 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java
@@ -24,17 +24,19 @@ import org.apache.camel.Message;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.apache.camel.util.xml.StringSource;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-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;
+@CamelSpringTest
@ContextConfiguration
-public class ProducerLocalRouteTest extends AbstractJUnit4SpringContextTests {
+public class ProducerLocalRouteTest {
private final String stockQuoteWebserviceUri = "http://localhost/";
private final String xmlRequestForGoogleStockQuote = "<GetQuote xmlns=\"http://www.webserviceX.NET/\"><symbol>GOOG</symbol></GetQuote>";
@@ -129,6 +131,6 @@ public class ProducerLocalRouteTest extends AbstractJUnit4SpringContextTests {
assertTrue(resultMessage.contains("Google Inc."));
Object bar = in.getHeader("foo");
- assertEquals("The header value should have been preserved", "bar", bar);
+ assertEquals("bar", bar, "The header value should have been preserved");
}
}
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 116e372..81d3fe6 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
@@ -20,18 +20,21 @@ import javax.xml.transform.Source;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.apache.camel.util.xml.StringSource;
-import org.junit.Ignore;
-import org.junit.Test;
+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;
-@Ignore("Run manually, makes connection to external webservice")
+@Disabled("Run manually, makes connection to external webservice")
+@CamelSpringTest
@ContextConfiguration
-public class ProducerRemoteRouteTest extends AbstractJUnit4SpringContextTests {
+public class ProducerRemoteRouteTest {
private final String stockQuoteWebserviceUri = "http://www.webservicex.net/stockquote.asmx";
private final String xmlRequestForGoogleStockQuote = "<GetQuote xmlns=\"http://www.webserviceX.NET/\"><symbol>GOOG</symbol></GetQuote>";
@@ -39,7 +42,7 @@ public class ProducerRemoteRouteTest extends AbstractJUnit4SpringContextTests {
@Produce
private ProducerTemplate template;
- @Test(timeout = 5000)
+ @Test @Timeout(5)
public void consumeStockQuoteWebserviceWithDefaultTemplate() throws Exception {
Object result = template.requestBody("direct:stockQuoteWebserviceWithDefaultTemplate", xmlRequestForGoogleStockQuote);
@@ -47,7 +50,7 @@ public class ProducerRemoteRouteTest extends AbstractJUnit4SpringContextTests {
assertTrue(result instanceof Source);
}
- @Test(timeout = 5000)
+ @Test @Timeout(5)
public void consumeStockQuoteWebservice() throws Exception {
Object result = template.requestBody("direct:stockQuoteWebservice", xmlRequestForGoogleStockQuote);
@@ -55,7 +58,7 @@ public class ProducerRemoteRouteTest extends AbstractJUnit4SpringContextTests {
assertTrue(result instanceof Source);
}
- @Test(timeout = 5000)
+ @Test @Timeout(5)
public void consumeStockQuoteWebserviceWithCamelStringSourceInput() throws Exception {
Object result = template.requestBody("direct:stockQuoteWebservice", new StringSource(xmlRequestForGoogleStockQuote));
@@ -63,7 +66,7 @@ public class ProducerRemoteRouteTest extends AbstractJUnit4SpringContextTests {
assertTrue(result instanceof Source);
}
- @Test(timeout = 5000)
+ @Test @Timeout(5)
public void consumeStockQuoteWebserviceWithNonDefaultMessageFactory() throws Exception {
Object result = template.requestBody("direct:stockQuoteWebserviceWithNonDefaultMessageFactory", xmlRequestForGoogleStockQuote);
@@ -71,7 +74,7 @@ public class ProducerRemoteRouteTest extends AbstractJUnit4SpringContextTests {
assertTrue(result instanceof Source);
}
- @Test(timeout = 5000)
+ @Test @Timeout(5)
public void consumeStockQuoteWebserviceAndConvertResult() throws Exception {
Object result = template.requestBody("direct:stockQuoteWebserviceAsString", xmlRequestForGoogleStockQuote);
@@ -81,7 +84,7 @@ public class ProducerRemoteRouteTest extends AbstractJUnit4SpringContextTests {
assertTrue(resultMessage.contains("Google Inc."));
}
- @Test(timeout = 5000)
+ @Test @Timeout(5)
public void consumeStockQuoteWebserviceAndProvideEndpointUriByHeader() throws Exception {
Object result = template.requestBodyAndHeader("direct:stockQuoteWebserviceWithoutDefaultUri", xmlRequestForGoogleStockQuote,
SpringWebserviceConstants.SPRING_WS_ENDPOINT_URI, stockQuoteWebserviceUri);
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest.java
index cc389a5..656b39e 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest.java
@@ -21,18 +21,20 @@ import java.net.SocketTimeoutException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Disabled;
+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.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-@Ignore("Run manually, makes connection to external webservice")
+@Disabled("Run manually, makes connection to external webservice")
+@CamelSpringTest
@ContextConfiguration
-public class ProducerRemoteRouteTimeOutTest extends AbstractJUnit4SpringContextTests {
+public class ProducerRemoteRouteTimeOutTest {
private final String xmlRequestForGoogleStockQuote = "<GetQuote xmlns=\"http://www.webserviceX.NET/\"><symbol>GOOG</symbol></GetQuote>";
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java
index 28ae07e..204e70b 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java
@@ -20,15 +20,17 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
-import org.junit.Test;
+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.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@CamelSpringTest
@ContextConfiguration
-public class SoapHeaderTest extends AbstractJUnit4SpringContextTests {
+public class SoapHeaderTest {
private final String xmlRequestForGoogleStockQuote = "<GetQuote xmlns=\"http://www.webserviceX.NET/\"><symbol>GOOG</symbol></GetQuote>";
private final String soapHeader = "<h:Header xmlns:h=\"http://www.webserviceX.NET/\"><h:MessageID>1234567890</h:MessageID><h:Nested><h:NestedID>1111</h:NestedID></h:Nested></h:Header>";
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 32264c5..8b91062 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
@@ -23,14 +23,16 @@ import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.attachment.AttachmentMessage;
-import org.junit.Test;
+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;
+@CamelSpringTest
@ContextConfiguration
-public class SoapResponseAttachmentTest extends AbstractJUnit4SpringContextTests {
+public class SoapResponseAttachmentTest {
private final String xmlRequestForGoogleStockQuote = "<GetQuote xmlns=\"http://www.webserviceX.NET/\"><symbol>GOOG</symbol></GetQuote>";
private final String soapHeader = "<h:Header xmlns:h=\"http://www.webserviceX.NET/\"><h:MessageID>1234567890</h:MessageID><h:Nested><h:NestedID>1111</h:NestedID></h:Nested></h:Header>";
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractConsumerTests.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractConsumerTests.java
index b7e6bd6..37c24ee 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractConsumerTests.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractConsumerTests.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.spring.ws.addressing;
import java.net.URI;
import org.fest.assertions.Assertions;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.ws.soap.addressing.client.ActionCallback;
import org.springframework.ws.soap.client.SoapFaultClientException;
@@ -71,7 +71,7 @@ public abstract class AbstractConsumerTests extends AbstractWSATests {
}
@Test
- @Ignore(value = "Not implemented yet")
+ @Disabled(value = "Not implemented yet")
public void overrideHeaderAction4output() throws Exception {
ActionCallback requestCallback = channelIn("http://override-ok.com");
@@ -81,7 +81,7 @@ public abstract class AbstractConsumerTests extends AbstractWSATests {
}
@Test
- @Ignore(value = "Not implemented yet")
+ @Disabled(value = "Not implemented yet")
public void overrideHeaderAction4fault() throws Exception {
ActionCallback requestCallback = channelIn("http://override-fault.com");
try {
@@ -93,7 +93,7 @@ public abstract class AbstractConsumerTests extends AbstractWSATests {
}
@Test
- @Ignore(value = "Not implemented yet")
+ @Disabled(value = "Not implemented yet")
public void headerAction4output() throws Exception {
ActionCallback requestCallback = channelIn("http://headerOnly-ok.com");
@@ -103,7 +103,7 @@ public abstract class AbstractConsumerTests extends AbstractWSATests {
}
@Test
- @Ignore(value = "Not implemented yet")
+ @Disabled(value = "Not implemented yet")
public void headerAction4fault() throws Exception {
ActionCallback requestCallback = channelIn("http://headerOnly-fault.com");
try {
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractWSATests.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractWSATests.java
index 03ef559..19fd8ce 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractWSATests.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/AbstractWSATests.java
@@ -26,9 +26,9 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.camel.component.spring.ws.utils.OutputChannelReceiver;
import org.apache.camel.component.spring.ws.utils.TestUtil;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.ws.client.core.WebServiceTemplate;
import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.addressing.client.ActionCallback;
@@ -36,6 +36,9 @@ import org.springframework.ws.soap.addressing.core.EndpointReference;
import org.springframework.ws.soap.addressing.core.MessageAddressingProperties;
import org.springframework.ws.soap.addressing.version.Addressing10;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* Provides abstract test for WS-Addressing
*/
@@ -51,7 +54,7 @@ public abstract class AbstractWSATests extends CamelSpringTestSupport {
private String requestInputAction;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
// initialize beans for catching results
@@ -69,18 +72,13 @@ public abstract class AbstractWSATests extends CamelSpringTestSupport {
requestInputAction = null;
}
- @After
+ @AfterEach
public void after() throws Exception {
assertNotNull(result);
}
/**
* Creates WS-Addressing Action and ReplyTo param for request
- *
- * @param action
- * @param replyTo
- * @return
- * @throws URISyntaxException
*/
protected final ActionCallback actionAndReplyTo(String action, String replyTo) throws URISyntaxException {
requestInputAction = action;
@@ -93,11 +91,6 @@ public abstract class AbstractWSATests extends CamelSpringTestSupport {
/**
* Creates WS-Addressing Action param for request
- *
- * @param action
- * @param replyTo
- * @return
- * @throws URISyntaxException
*/
protected final ActionCallback action(String action) throws URISyntaxException {
return actionAndReplyTo(action, null);
@@ -105,11 +98,6 @@ public abstract class AbstractWSATests extends CamelSpringTestSupport {
/**
* Creates WS-Addressing To and ReplyTo param for request
- *
- * @param action
- * @param replyTo
- * @return
- * @throws URISyntaxException
*/
protected final ActionCallback toAndReplyTo(String to, String replyTo) throws URISyntaxException {
requestInputAction = "http://doesn-not-matter.com";
@@ -122,11 +110,6 @@ public abstract class AbstractWSATests extends CamelSpringTestSupport {
/**
* Creates WS-Addressing To param for request
- *
- * @param action
- * @param replyTo
- * @return
- * @throws URISyntaxException
*/
protected final ActionCallback to(String to) throws URISyntaxException {
return toAndReplyTo(to, null);
@@ -135,9 +118,6 @@ public abstract class AbstractWSATests extends CamelSpringTestSupport {
/**
* Construct a default action for the response message from the input
* message using the default response action suffix.
- *
- * @return
- * @throws URISyntaxException
*/
protected URI getDefaultResponseAction() throws URISyntaxException {
return new URI(requestInputAction + "Response");
@@ -145,10 +125,7 @@ public abstract class AbstractWSATests extends CamelSpringTestSupport {
/**
* Only response is allow using a brand new channel
- *
- * @return
*/
-
protected final MessageAddressingProperties newChannelParams() {
assertNotNull(newReply);
assertNotNull(newReply.getMessageContext());
@@ -163,8 +140,6 @@ public abstract class AbstractWSATests extends CamelSpringTestSupport {
/**
* Only response is allow using same channel
- *
- * @return
*/
protected final MessageAddressingProperties sameChannelParams() {
// we expect the same channel reply
@@ -185,18 +160,12 @@ public abstract class AbstractWSATests extends CamelSpringTestSupport {
* Provides such an ActionCallback that sets the WS-Addressing param replyTo
* or doesn't set WS-Addressing param replyTo. In other words it cause
* response to be return using new or same channel as the request.
- *
- * @param action
- * @return
- * @throws URISyntaxException
*/
abstract ActionCallback channelIn(String action) throws URISyntaxException;
/**
* Provide corresponding results based on channel input. These two abstract
* methods (channelIn and channelOut)are bind together tighly.
- *
- * @return
*/
abstract MessageAddressingProperties channelOut();
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java
index 166351c..99be246 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java
@@ -23,19 +23,23 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.spring.ws.utils.OutputChannelReceiver;
import org.apache.camel.component.spring.ws.utils.TestUtil;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.fest.assertions.Assertions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.addressing.client.ActionCallback;
import org.springframework.ws.soap.addressing.core.MessageAddressingProperties;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Provides abstract test for fault and output params for spring-ws:to: and
* spring-ws:action: endpoints
*/
+@CamelSpringTest
public class CamelDirectSenderTest extends AbstractWSATests {
private OutputChannelReceiver customChannel;
@@ -44,7 +48,7 @@ public class CamelDirectSenderTest extends AbstractWSATests {
private MockEndpoint endpointCamelDirect;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
// initialize beans for catching results
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java
index 73e637e..0815bc6 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java
@@ -24,9 +24,9 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.spring.ws.utils.TestUtil;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.client.WebServiceIOException;
@@ -35,6 +35,8 @@ import org.springframework.ws.soap.addressing.client.ActionCallback;
import org.springframework.ws.soap.addressing.version.Addressing10;
import org.springframework.ws.soap.client.core.SoapActionCallback;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class ConsumerWSAEndpointMappingRouteTest extends CamelSpringTestSupport {
private final String xmlBody = "<GetQuote xmlns=\"http://www.stockquotes.edu/\"><symbol>GOOG</symbol></GetQuote>";
@@ -69,7 +71,7 @@ public class ConsumerWSAEndpointMappingRouteTest extends CamelSpringTestSupport
private WebServiceTemplate webServiceTemplate;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
webServiceTemplate = applicationContext.getBean("webServiceTemplate", WebServiceTemplate.class);
@@ -156,11 +158,13 @@ public class ConsumerWSAEndpointMappingRouteTest extends CamelSpringTestSupport
resultOutputAndFault2.assertIsSatisfied();
}
- @Test(expected = WebServiceIOException.class)
+ @Test
public void testWrongWSAddressingAction() throws Exception {
- StreamSource source = new StreamSource(new StringReader(xmlBody));
- webServiceTemplate.sendSourceAndReceive(source, new ActionCallback("http://this-is-a-wrong-ws-addressing-action"), TestUtil.NOOP_SOURCE_EXTRACTOR);
- resultEndpointAction.assertIsSatisfied();
+ assertThrows(WebServiceIOException.class, () -> {
+ StreamSource source = new StreamSource(new StringReader(xmlBody));
+ webServiceTemplate.sendSourceAndReceive(source, new ActionCallback("http://this-is-a-wrong-ws-addressing-action"), TestUtil.NOOP_SOURCE_EXTRACTOR);
+ resultEndpointAction.assertIsSatisfied();
+ });
}
@Test
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsActionTests.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsActionTests.java
index 4d519931..7416e14 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsActionTests.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsActionTests.java
@@ -18,11 +18,13 @@ package org.apache.camel.component.spring.ws.addressing;
import java.net.URISyntaxException;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.soap.addressing.client.ActionCallback;
import org.springframework.ws.soap.addressing.core.MessageAddressingProperties;
+@CamelSpringTest
public class ConsumerWSANewChannelParamsActionTests extends AbstractConsumerTests {
@Override
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsToTests.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsToTests.java
index 1250a7d..1d58825 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsToTests.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSANewChannelParamsToTests.java
@@ -18,11 +18,13 @@ package org.apache.camel.component.spring.ws.addressing;
import java.net.URISyntaxException;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.soap.addressing.client.ActionCallback;
import org.springframework.ws.soap.addressing.core.MessageAddressingProperties;
+@CamelSpringTest
public class ConsumerWSANewChannelParamsToTests extends AbstractConsumerTests {
@Override
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsActionTests.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsActionTests.java
index 4316c77..fd5ec6c 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsActionTests.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsActionTests.java
@@ -18,11 +18,13 @@ package org.apache.camel.component.spring.ws.addressing;
import java.net.URISyntaxException;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.soap.addressing.client.ActionCallback;
import org.springframework.ws.soap.addressing.core.MessageAddressingProperties;
+@CamelSpringTest
public class ConsumerWSASameChannelParamsActionTests extends AbstractConsumerTests {
@Override
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsToTests.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsToTests.java
index d54c032..d4b4725 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsToTests.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSASameChannelParamsToTests.java
@@ -18,11 +18,13 @@ package org.apache.camel.component.spring.ws.addressing;
import java.net.URISyntaxException;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.soap.addressing.client.ActionCallback;
import org.springframework.ws.soap.addressing.core.MessageAddressingProperties;
+@CamelSpringTest
public class ConsumerWSASameChannelParamsToTests extends AbstractConsumerTests {
@Override
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsBasicTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsBasicTest.java
index 6214da4..0ef14b7 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsBasicTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsBasicTest.java
@@ -22,16 +22,18 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.spring.ws.utils.OutputChannelReceiver;
import org.apache.camel.component.spring.ws.utils.TestUtil;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.fest.assertions.Assertions;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.addressing.core.MessageAddressingProperties;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ProducerParamsBasicTest extends CamelSpringTestSupport {
private static URI anonymousUri;
@@ -44,14 +46,14 @@ public class ProducerParamsBasicTest extends CamelSpringTestSupport {
private ProducerTemplate template;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
sender = getMandatoryBean(OutputChannelReceiver.class, "senderReceiver");
sender.clear();
}
- @BeforeClass
+ @BeforeAll
public static void setUpConstants() throws Exception {
anonymousUri = new URI("http://www.w3.org/2005/08/addressing/anonymous");
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java
index 2be1934..10099bd 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java
@@ -22,17 +22,19 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.spring.ws.utils.OutputChannelReceiver;
import org.apache.camel.component.spring.ws.utils.TestUtil;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.fest.assertions.Assertions;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.addressing.core.MessageAddressingProperties;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ProducerParamsPrecedenceTest extends CamelSpringTestSupport {
private static URI anonymousUri;
@@ -45,21 +47,21 @@ public class ProducerParamsPrecedenceTest extends CamelSpringTestSupport {
private ProducerTemplate template;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
sender = getMandatoryBean(OutputChannelReceiver.class, "senderReceiver");
sender.clear();
}
- @BeforeClass
+ @BeforeAll
public static void setUpConstants() throws Exception {
anonymousUri = new URI("http://www.w3.org/2005/08/addressing/anonymous");
}
// TODO AZ
@Test
- @Ignore
+ @Disabled
public void testWsAddressingAction() throws Exception {
Object result = template.requestBody("direct:wsAddressingAction", xmlBody);
assertNotNull(result);
@@ -77,7 +79,7 @@ public class ProducerParamsPrecedenceTest extends CamelSpringTestSupport {
// TODO AZ
@Test
- @Ignore
+ @Disabled
public void testWsAddressingActionPrecendence() throws Exception {
Object result = template.requestBody("direct:precedenceWsAddressingAction", xmlBody);
assertNotNull(result);
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
index 2b81508..08bdb93 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
@@ -21,24 +21,21 @@ import javax.xml.namespace.QName;
import org.apache.camel.attachment.AttachmentMessage;
import org.apache.camel.component.spring.ws.SpringWebserviceConstants;
-import org.apache.camel.test.junit4.ExchangeTestSupport;
+import org.apache.camel.test.junit5.ExchangeTestSupport;
import org.fest.assertions.Assertions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.ws.pox.dom.DomPoxMessage;
import org.springframework.ws.pox.dom.DomPoxMessageFactory;
import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
-@RunWith(value = JUnit4.class)
public class BasicMessageFilterTest extends ExchangeTestSupport {
private BasicMessageFilter filter;
private SoapMessage message;
- @Before
+ @BeforeEach
public void before() {
filter = new BasicMessageFilter();
SaajSoapMessageFactory saajSoapMessageFactory = new SaajSoapMessageFactory();
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest.java
index 492c162..7989f93 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest.java
@@ -20,17 +20,21 @@ import net.javacrumbs.calc.model.PlusRequest;
import net.javacrumbs.calc.model.PlusResponse;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.ws.client.core.WebServiceTemplate;
import org.springframework.ws.client.support.interceptor.ClientInterceptor;
import org.springframework.ws.soap.security.wss4j2.Wss4jSecurityInterceptor;
-@Ignore("run manually since it requires running sample"
+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("run manually since it requires running sample"
+ " secured ws on j2ee-compliant application server")
public class ProducerWss4JSecurityHeaderTest extends CamelSpringTestSupport {
@@ -40,7 +44,7 @@ public class ProducerWss4JSecurityHeaderTest extends CamelSpringTestSupport {
private WebServiceTemplate webServiceTemplate;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
webServiceTemplate = applicationContext.getBean("webServiceTemplate", WebServiceTemplate.class);
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/utils/TestUtil.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/utils/TestUtil.java
index 25742fd..2f4c621 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/utils/TestUtil.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/utils/TestUtil.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
-import org.junit.Assert;
import org.springframework.util.StringUtils;
import org.springframework.ws.client.core.SourceExtractor;
import org.springframework.ws.soap.SoapHeader;
@@ -33,6 +32,8 @@ import org.springframework.ws.soap.addressing.version.Addressing10;
import org.springframework.ws.soap.addressing.version.Addressing200408;
import org.springframework.ws.soap.addressing.version.AddressingVersion;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public final class TestUtil {
public static final SourceExtractor<Object> NOOP_SOURCE_EXTRACTOR = new SourceExtractor<Object>() {
@@ -49,15 +50,12 @@ public final class TestUtil {
* compare some text coming from 2 different OS.
*/
public static void assertEqualsIgnoreNewLinesSymbol(String expected, String actual) {
- Assert.assertEquals(StringUtils.deleteAny(expected, "\n\r"), StringUtils.deleteAny(actual, "\n\r"));
+ assertEquals(StringUtils.deleteAny(expected, "\n\r"), StringUtils.deleteAny(actual, "\n\r"));
}
/**
* Retrieve a WS-Addressing properties from the soapMessage
- *
- * @param messageContext
- * @return
*/
public static MessageAddressingProperties getWSAProperties(SoapMessage soapMessage) {
AddressingVersion[] versions = new AddressingVersion[] {new Addressing200408(), new Addressing10()};
[camel] 14/27: [CAMEL-11807] Upgrade camel-stringtemplate 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 31a53a7939c17e3d8a3ab0b02405a7d98198f242
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 11:45:45 2020 +0200
[CAMEL-11807] Upgrade camel-stringtemplate to junit5
---
components/camel-stringtemplate/pom.xml | 6 +++---
.../component/stringtemplate/StringTemplateConcurrentTest.java | 6 ++++--
.../component/stringtemplate/StringTemplateContentCacheTest.java | 8 ++++----
.../stringtemplate/StringTemplateCustomDelimiterTest.java | 6 ++++--
.../camel/component/stringtemplate/StringTemplateLetterTest.java | 4 ++--
.../apache/camel/component/stringtemplate/StringTemplateTest.java | 6 ++++--
6 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/components/camel-stringtemplate/pom.xml b/components/camel-stringtemplate/pom.xml
index 1eadd9d..7baf79f 100644
--- a/components/camel-stringtemplate/pom.xml
+++ b/components/camel-stringtemplate/pom.xml
@@ -50,7 +50,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -64,8 +64,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-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java
index cf9bdc9..744237f 100644
--- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java
+++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.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 StringTemplateConcurrentTest extends CamelTestSupport {
diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
index 92862f2..4bd19b4 100644
--- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
+++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
@@ -25,9 +25,9 @@ import javax.management.ObjectName;
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.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test the cahce when reloading .tm files in the classpath
@@ -35,7 +35,7 @@ import org.junit.Test;
public class StringTemplateContentCacheTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
index 126f25f..33dc996 100644
--- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
+++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateCustomDelimiterTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.stringtemplate;
import org.apache.camel.Exchange;
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 StringTemplateCustomDelimiterTest extends CamelTestSupport {
private static final String DIRECT_BRACE = "direct:brace";
diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
index b2fb7b4..b40b6dd 100644
--- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
+++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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;
/**
* Unit test for wiki documentation
diff --git a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java
index 976a2b1..f9a07f5 100644
--- a/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java
+++ b/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateTest.java
@@ -21,8 +21,10 @@ import java.util.Map;
import org.apache.camel.Exchange;
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 StringTemplateTest extends CamelTestSupport {
[camel] 16/27: [CAMEL-11807] Upgrade camel-tarfile 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 13aada9e6a7514f335fa1ffd8ffc750700c93ff6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 11:58:29 2020 +0200
[CAMEL-11807] Upgrade camel-tarfile to junit5
---
components/camel-tarfile/pom.xml | 4 +--
.../tarfile/SpringTarFileDataFormatTest.java | 13 ++++++---
.../tarfile/SpringTarSplitterRouteTest.java | 4 +--
.../dataformat/tarfile/TarFileDataFormatTest.java | 32 ++++++++++++----------
.../tarfile/TarFileMultipleFilesSplitterTest.java | 2 +-
.../tarfile/TarFileSplitAndDeleteTest.java | 15 ++++++----
.../tarfile/TarSplitterRouteIssueTest.java | 10 ++++---
.../dataformat/tarfile/TarSplitterRouteTest.java | 4 +--
.../AggregationStrategyWithFilenameHeaderTest.java | 21 ++++++++------
.../AggregationStrategyWithPreservationTest.java | 20 ++++++++------
.../tarfile/TarAggregationStrategyTest.java | 17 ++++++++----
11 files changed, 85 insertions(+), 57 deletions(-)
diff --git a/components/camel-tarfile/pom.xml b/components/camel-tarfile/pom.xml
index 0956dc0a..2104806 100644
--- a/components/camel-tarfile/pom.xml
+++ b/components/camel-tarfile/pom.xml
@@ -48,7 +48,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -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-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
index f5e68d9..ff81579 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
@@ -22,9 +22,9 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -33,6 +33,11 @@ import static org.apache.camel.Exchange.FILE_NAME;
import static org.apache.camel.dataformat.tarfile.TarUtils.TEXT;
import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes;
import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+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.assertTrue;
public class SpringTarFileDataFormatTest extends CamelSpringTestSupport {
private static final File TEST_DIR = new File("target/springtar");
@@ -157,7 +162,7 @@ public class SpringTarFileDataFormatTest extends CamelSpringTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(TEST_DIR);
super.setUp();
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java
index 381eac2..f4c5dbe 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.dataformat.tarfile;
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.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringTarSplitterRouteTest extends CamelSpringTestSupport {
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
index 64f3c4f..8b9c3c5 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
@@ -22,6 +22,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Iterator;
@@ -33,19 +34,24 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.Exchange.FILE_NAME;
import static org.apache.camel.dataformat.tarfile.TarUtils.TEXT;
import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes;
import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText;
import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredTextInFolder;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+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 TarFileDataFormat}.
@@ -123,9 +129,10 @@ public class TarFileDataFormatTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testUntarWithCorruptedTarFile() throws Exception {
- template.sendBody("direct:corruptUntar", new File("src/test/resources/data/corrupt.tar"));
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:corruptUntar", new File("src/test/resources/data/corrupt.tar")));
}
@Test
@@ -139,7 +146,7 @@ public class TarFileDataFormatTest extends CamelTestSupport {
Exchange exchange = mock.getReceivedExchanges().get(0);
assertEquals(exchange.getIn().getMessageId(), exchange.getIn().getHeader(FILE_NAME));
- assertEquals(TEXT, new String((byte[]) exchange.getIn().getBody(), "UTF-8"));
+ assertEquals(TEXT, new String((byte[]) exchange.getIn().getBody(), StandardCharsets.UTF_8));
}
@Test
@@ -189,7 +196,7 @@ public class TarFileDataFormatTest extends CamelTestSupport {
@Test
public void testDslTar() throws Exception {
- getMockEndpoint("mock:dslTar").expectedBodiesReceived(getTaredText("poem.txt"));
+ getMockEndpoint("mock:dslTar").expectedBodiesReceived((Object) getTaredText("poem.txt"));
getMockEndpoint("mock:dslTar").expectedHeaderReceived(FILE_NAME, "poem.txt.tar");
template.sendBodyAndHeader("direct:dslTar", TEXT, FILE_NAME, "poem.txt");
@@ -223,12 +230,12 @@ public class TarFileDataFormatTest extends CamelTestSupport {
tar.setUsingIterator(true);
tar.setAllowEmptyDirectory(false);
template.sendBody("direct:untarWithEmptyDirectory", new File("src/test/resources/data/hello.tar"));
- assertTrue(!Files.exists(Paths.get("hello_out/Configurations2")));
+ assertFalse(Files.exists(Paths.get("hello_out/Configurations2")));
deleteDirectory(new File("hello_out"));
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(TEST_DIR);
super.setUp();
@@ -283,12 +290,9 @@ public class TarFileDataFormatTest extends CamelTestSupport {
outputFile.mkdirs();
} else {
outputFile.getParentFile().mkdirs();
- TarArchiveInputStream debInputStream = (TarArchiveInputStream)
- new ArchiveStreamFactory().createArchiveInputStream("tar", is);
- try {
+ try (TarArchiveInputStream debInputStream = (TarArchiveInputStream)
+ new ArchiveStreamFactory().createArchiveInputStream("tar", is)) {
copy(debInputStream, outputFile);
- } finally {
- debInputStream.close();
}
}
}
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java
index bac24d7..436ea7b 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.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.Test;
public class TarFileMultipleFilesSplitterTest extends TarSplitterRouteTest {
static final String PROCESSED_FILES_HEADER_NAME = "processedFiles";
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java
index e451655..de45208 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java
@@ -27,14 +27,17 @@ 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.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class TarFileSplitAndDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/testDeleteTarFileWhenUnmarshalWithDataFormat");
deleteDirectory("target/testDeleteTarFileWhenUnmarshalWithSplitter");
@@ -52,7 +55,7 @@ public class TarFileSplitAndDeleteTest extends CamelTestSupport {
notify.matchesMockWaitTime();
// the original file should have been deleted
- assertFalse("File should been deleted", new File(tarFile).exists());
+ assertFalse(new File(tarFile).exists(), "File should been deleted");
}
@Test
@@ -66,7 +69,7 @@ public class TarFileSplitAndDeleteTest extends CamelTestSupport {
notify.matchesMockWaitTime();
// the original file should have been deleted,
- assertFalse("File should been deleted", new File(tarFile).exists());
+ assertFalse(new File(tarFile).exists(), "File should been deleted");
}
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
index 046017c..b1d0bed 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
@@ -19,14 +19,16 @@ package org.apache.camel.dataformat.tarfile;
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.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class TarSplitterRouteIssueTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/tar");
super.setUp();
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java
index c33f930..d323dd1 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.dataformat.tarfile;
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 TarSplitterRouteTest extends CamelTestSupport {
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java
index 25775a7..ea3e3d4 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java
@@ -25,13 +25,18 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.Before;
-import org.junit.Test;
+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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport {
@@ -40,7 +45,7 @@ public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport
private TarAggregationStrategy tar = new TarAggregationStrategy(false, true);
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tar.setParentDir("target/temp");
deleteDirectory("target/temp");
@@ -61,8 +66,8 @@ public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport
Thread.sleep(500);
File[] files = new File("target/out").listFiles();
- assertTrue(files != null);
- assertTrue("Should be a file in target/out directory", files.length > 0);
+ assertNotNull(files);
+ assertTrue(files.length > 0, "Should be a file in target/out directory");
File resultFile = files[0];
@@ -73,9 +78,9 @@ public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport
int fileCount = 0;
for (TarArchiveEntry entry = tis.getNextTarEntry(); entry != null; entry = tis.getNextTarEntry()) {
fileCount++;
- assertTrue("Tar entry file name should be on of: " + FILE_NAMES, FILE_NAMES.contains(entry.getName()));
+ assertTrue(FILE_NAMES.contains(entry.getName()), "Tar entry file name should be on of: " + FILE_NAMES);
}
- assertEquals("Tar file should contain " + FILE_NAMES.size() + " files", FILE_NAMES.size(), fileCount);
+ assertEquals(FILE_NAMES.size(), fileCount, "Tar file should contain " + FILE_NAMES.size() + " files");
} finally {
IOHelper.close(tis);
}
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java
index 69f883c..d44e5d9 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java
@@ -24,12 +24,17 @@ import java.util.Set;
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.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.Before;
-import org.junit.Test;
+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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
@@ -38,7 +43,7 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
private TarAggregationStrategy tar = new TarAggregationStrategy(true, true);
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tar.setParentDir("target/temp");
deleteDirectory("target/temp");
@@ -56,7 +61,7 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
Thread.sleep(500);
File[] files = new File("target/out").listFiles();
- assertTrue("Should be a file in target/out directory", files.length > 0);
+ assertTrue(files.length > 0, "Should be a file in target/out directory");
File resultFile = files[0];
Set<String> expectedTarFiles = new HashSet<>(Arrays.asList("another/hello.txt",
@@ -74,9 +79,8 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
}
fileCount++;
}
- assertTrue("Tar file should contains " + AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES + " files",
- fileCount == AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES);
- assertEquals("Should have found all of the tar files in the file.", 0, expectedTarFiles.size());
+ assertEquals(fileCount, AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES, "Tar file should contains " + AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES + " files");
+ assertEquals(0, expectedTarFiles.size(), "Should have found all of the tar files in the file.");
} finally {
IOHelper.close(tin);
}
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java
index fdef4cf..13f3ad1 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java
@@ -21,12 +21,16 @@ import java.io.FileInputStream;
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.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.Before;
-import org.junit.Test;
+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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TarAggregationStrategyTest extends CamelTestSupport {
@@ -35,7 +39,7 @@ public class TarAggregationStrategyTest extends CamelTestSupport {
private TarAggregationStrategy tar = new TarAggregationStrategy();
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tar.setParentDir("target/temp");
deleteDirectory("target/temp");
@@ -55,7 +59,7 @@ public class TarAggregationStrategyTest extends CamelTestSupport {
File[] files = new File("target/out").listFiles();
assertTrue(files != null);
- assertTrue("Should be a file in target/out directory", files.length > 0);
+ assertTrue(files.length > 0, "Should be a file in target/out directory");
File resultFile = files[0];
@@ -65,7 +69,8 @@ public class TarAggregationStrategyTest extends CamelTestSupport {
for (TarArchiveEntry te = tin.getNextTarEntry(); te != null; te = tin.getNextTarEntry()) {
fileCount = fileCount + 1;
}
- assertEquals("Tar file should contains " + TarAggregationStrategyTest.EXPECTED_NO_FILES + " files", TarAggregationStrategyTest.EXPECTED_NO_FILES, fileCount);
+ assertEquals(TarAggregationStrategyTest.EXPECTED_NO_FILES, fileCount,
+ "Tar file should contains " + TarAggregationStrategyTest.EXPECTED_NO_FILES + " files");
} finally {
IOHelper.close(tin);
}
[camel] 13/27: [CAMEL-11807] Upgrade camel-stomp 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 979d3326e0aabed27effc8f1bb3bcc1d12131099
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 11:43:56 2020 +0200
[CAMEL-11807] Upgrade camel-stomp to junit5
---
components/camel-stomp/pom.xml | 6 +++---
.../org/apache/camel/component/stomp/StompBaseTest.java | 13 ++++++++-----
.../stomp/StompConsumerHeaderFilterStrategyTest.java | 2 +-
.../org/apache/camel/component/stomp/StompConsumerTest.java | 2 +-
.../apache/camel/component/stomp/StompConsumerUriTest.java | 2 +-
.../camel/component/stomp/StompCustomHeadersTest.java | 4 +++-
.../org/apache/camel/component/stomp/StompProducerTest.java | 7 ++++---
7 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/components/camel-stomp/pom.xml b/components/camel-stomp/pom.xml
index ad28423..6b9dd7b 100644
--- a/components/camel-stomp/pom.xml
+++ b/components/camel-stomp/pom.xml
@@ -49,7 +49,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -64,8 +64,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-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
index 1c22bd8..0dc99a4 100644
--- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
+++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
@@ -27,13 +27,16 @@ import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.fusesource.stomp.client.Stomp;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class StompBaseTest extends CamelTestSupport {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
protected BrokerService brokerService;
protected int numberOfMessages = 100;
protected int port;
@@ -74,7 +77,7 @@ public abstract class StompBaseTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
port = AvailablePortFinder.getNextAvailable();
@@ -105,7 +108,7 @@ public abstract class StompBaseTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
if (brokerService != null) {
diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerHeaderFilterStrategyTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerHeaderFilterStrategyTest.java
index e3aa9ae..f511906 100644
--- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerHeaderFilterStrategyTest.java
+++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerHeaderFilterStrategyTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.support.DefaultHeaderFilterStrategy;
import org.fusesource.stomp.client.BlockingConnection;
import org.fusesource.stomp.client.Stomp;
import org.fusesource.stomp.codec.StompFrame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.fusesource.hawtbuf.UTF8Buffer.utf8;
import static org.fusesource.stomp.client.Constants.DESTINATION;
diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
index 7d19a20..dc8cec0 100644
--- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
+++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.fusesource.stomp.client.BlockingConnection;
import org.fusesource.stomp.client.Stomp;
import org.fusesource.stomp.codec.StompFrame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.fusesource.hawtbuf.UTF8Buffer.utf8;
import static org.fusesource.stomp.client.Constants.DESTINATION;
diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
index de97b47..2bf9900 100644
--- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
+++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.fusesource.stomp.client.BlockingConnection;
import org.fusesource.stomp.client.Stomp;
import org.fusesource.stomp.codec.StompFrame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.fusesource.hawtbuf.UTF8Buffer.utf8;
import static org.fusesource.stomp.client.Constants.DESTINATION;
diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompCustomHeadersTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompCustomHeadersTest.java
index 05e093f..7b949fb 100644
--- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompCustomHeadersTest.java
+++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompCustomHeadersTest.java
@@ -20,7 +20,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class StompCustomHeadersTest extends StompBaseTest {
diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java
index 92b9173..dcbd5b6 100644
--- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java
+++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java
@@ -27,11 +27,13 @@ import org.fusesource.hawtbuf.AsciiBuffer;
import org.fusesource.stomp.client.BlockingConnection;
import org.fusesource.stomp.client.Stomp;
import org.fusesource.stomp.codec.StompFrame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.fusesource.stomp.client.Constants.DESTINATION;
import static org.fusesource.stomp.client.Constants.ID;
import static org.fusesource.stomp.client.Constants.SUBSCRIBE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class StompProducerTest extends StompBaseTest {
@@ -62,7 +64,6 @@ public class StompProducerTest extends StompBaseTest {
for (int i = 0; i < numberOfMessages; i++) {
try {
StompFrame frame = subscribeConnection.receive();
- frame.contentAsString().startsWith("test message ");
assertTrue(frame.contentAsString().startsWith("test message "));
assertTrue(frame.getHeader(new AsciiBuffer(HEADER)).ascii().toString().startsWith(HEADER_VALUE));
latch.countDown();
@@ -85,7 +86,7 @@ public class StompProducerTest extends StompBaseTest {
}
latch.await(20, TimeUnit.SECONDS);
- assertTrue("Messages not consumed = " + latch.getCount(), latch.getCount() == 0);
+ assertEquals(0, latch.getCount(), "Messages not consumed = " + latch.getCount());
}
@Override
[camel] 19/27: [CAMEL-11807] Upgrade camel-tika 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 669140d7057dd1383f9d28f004ca6264641d73f4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 12:03:38 2020 +0200
[CAMEL-11807] Upgrade camel-tika to junit5
---
components/camel-tika/pom.xml | 6 +++---
.../org/apache/camel/component/tika/TikaDetectTest.java | 5 +++--
.../java/org/apache/camel/component/tika/TikaParseTest.java | 13 +++++++++----
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/components/camel-tika/pom.xml b/components/camel-tika/pom.xml
index 5820378..cc6aea7 100644
--- a/components/camel-tika/pom.xml
+++ b/components/camel-tika/pom.xml
@@ -55,7 +55,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>
@@ -64,8 +64,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
index 6295141..d01b6d6 100644
--- a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
+++ b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
@@ -23,9 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
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 static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
diff --git a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
index b2d73de..63739bc 100644
--- a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
+++ b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
@@ -31,12 +31,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.apache.camel.test.junit5.CamelTestSupport;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.txt.UniversalEncodingDetector;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.*;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.jupiter.api.Assertions.fail;
public class TikaParseTest extends CamelTestSupport {
[camel] 06/27: [CAMEL-11807] Upgrade camel-splunk-hec 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 0132b28a071598ac1aed9824d3a8e3d6e95a40df
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 10:30:43 2020 +0200
[CAMEL-11807] Upgrade camel-splunk-hec to junit5
---
components/camel-splunk-hec/pom.xml | 4 ++--
.../camel/component/splunkhec/SplunkHECConfigurationTest.java | 6 +++---
.../camel/component/splunkhec/SplunkHECEndpointTest.java | 6 +++---
.../splunkhec/integration/SplunkHECIntegrationTest.java | 10 ++++++----
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/components/camel-splunk-hec/pom.xml b/components/camel-splunk-hec/pom.xml
index bc97bcb..a07f71f 100644
--- a/components/camel-splunk-hec/pom.xml
+++ b/components/camel-splunk-hec/pom.xml
@@ -55,7 +55,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECConfigurationTest.java b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECConfigurationTest.java
index 8a9bf74..de877d7 100644
--- a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECConfigurationTest.java
+++ b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECConfigurationTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.splunkhec;
-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 SplunkHECConfigurationTest {
diff --git a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECEndpointTest.java b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECEndpointTest.java
index ef535df..975b0f4 100644
--- a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECEndpointTest.java
+++ b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECEndpointTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.splunkhec;
-import org.junit.Test;
+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 SplunkHECEndpointTest {
@Test
diff --git a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECIntegrationTest.java b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECIntegrationTest.java
index cc6642e..3feb430 100644
--- a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECIntegrationTest.java
+++ b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECIntegrationTest.java
@@ -30,11 +30,13 @@ import org.apache.camel.component.splunkhec.SplunkHECProducer;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultMessage;
-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;
-@Ignore("run manually since it requires a running local splunk server")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("run manually since it requires a running local splunk server")
public class SplunkHECIntegrationTest extends CamelTestSupport {
@Test
[camel] 22/27: [CAMEL-11807] Upgrade camel-weather 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 50e6d4d3ee0a9dfdcb623fc27f7e29529e27dc84
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 12:36:13 2020 +0200
[CAMEL-11807] Upgrade camel-weather to junit5
---
components/camel-weather/pom.xml | 9 +++++++--
.../camel/component/weather/BaseWeatherConsumerTest.java | 14 ++++++++++++--
.../CurrentWeatherConsumerGeolocationProviderTest.java | 7 +++++--
.../component/weather/CurrentWeatherConsumerHtmlTest.java | 2 ++
.../component/weather/CurrentWeatherConsumerTest.java | 2 ++
.../component/weather/CurrentWeatherConsumerXmlTest.java | 2 ++
.../weather/CurrentWeatherMadridProducerTest.java | 5 ++++-
.../apache/camel/component/weather/WeatherQueryTest.java | 12 ++++++------
8 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index 5786712..0ac364a 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -61,7 +61,12 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -71,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerTest.java
index a330a35..a9c7d2a 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/BaseWeatherConsumerTest.java
@@ -21,11 +21,21 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
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.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public abstract class BaseWeatherConsumerTest extends CamelTestSupport {
+ public static final String LS = System.lineSeparator();
+
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
protected void checkWeatherContent(String weather) {
// the default mode is json
log.debug("The weather in {} format is {}{}", WeatherMode.JSON, LS, weather);
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java
index 2795c5e..3821f6a 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerGeolocationProviderTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.weather;
-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 CurrentWeatherConsumerGeolocationProviderTest extends CamelTestSupport {
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
index abcd1c7..5ce71ea 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerHtmlTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+
public class CurrentWeatherConsumerHtmlTest extends BaseWeatherConsumerTest {
@Override
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
index 52172c3..a5bad86 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+
public class CurrentWeatherConsumerTest extends BaseWeatherConsumerTest {
@Override
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
index 9d16c2b..f88eb5d 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherConsumerXmlTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.weather;
import org.apache.camel.builder.RouteBuilder;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+
public class CurrentWeatherConsumerXmlTest extends BaseWeatherConsumerTest {
@Override
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
index e3ecaa1..5b5923b 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertNotNull;
public class CurrentWeatherMadridProducerTest extends BaseWeatherConsumerTest {
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
index e006549..7be07e0 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherQueryTest.java
@@ -18,17 +18,17 @@ package org.apache.camel.component.weather;
import org.apache.camel.component.weather.geolocation.GeoLocation;
import org.apache.camel.component.weather.geolocation.GeoLocationProvider;
-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.mockito.quality.Strictness;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class WeatherQueryTest {
private static final String LONGITUDE = "4.13";
@@ -41,7 +41,7 @@ public class WeatherQueryTest {
@Mock
private GeoLocationProvider exceptionThrowingGeoLocationProvider;
- @Before
+ @BeforeEach
public void setup() throws Exception {
GeoLocation location = new GeoLocation(LONGITUDE, LATITUDE);
when(geoLocationProvider.getCurrentGeoLocation()).thenReturn(location);
[camel] 03/27: [CAMEL-11807] Upgrade camel-solr 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 1f9a74c94e77f412caaee201bc98e9eeab95e5c9
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jul 22 23:04:37 2020 +0200
[CAMEL-11807] Upgrade camel-solr to junit5
---
components/camel-solr/pom.xml | 2 +-
.../camel/component/solr/InitSolrEndpointTest.java | 19 +++++---
.../camel/component/solr/SolrAddBeanTest.java | 10 ++--
.../camel/component/solr/SolrAddBeansTest.java | 14 +++---
.../component/solr/SolrComponentTestSupport.java | 40 +++++++++-------
.../camel/component/solr/SolrDeleteTest.java | 20 ++++----
.../component/solr/SolrServerMissingTest.java | 4 +-
.../camel/component/solr/SolrTestSupport.java | 6 +--
.../camel/component/solr/SolrTransactionsTest.java | 54 ++++++++++------------
.../camel/component/solr/SolrUpdateTest.java | 18 ++++----
.../test/junit5/params/ParameterizedExtension.java | 30 +++++++++---
11 files changed, 118 insertions(+), 99 deletions(-)
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 98cf612..44bf914 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/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>
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
index d7d01dc..d282592 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
@@ -17,7 +17,11 @@
package org.apache.camel.component.solr;
import org.apache.camel.ResolveEndpointFailedException;
-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.assertThrows;
public class InitSolrEndpointTest extends SolrTestSupport {
@@ -26,8 +30,8 @@ public class InitSolrEndpointTest extends SolrTestSupport {
@Test
public void endpointCreatedCorrectlyWithAllOptions() throws Exception {
SolrEndpoint solrEndpoint = context.getEndpoint(solrUrl + getFullOptions(), SolrEndpoint.class);
- assertEquals("queue size incorrect", 5, solrEndpoint.getStreamingQueueSize());
- assertEquals("thread count incorrect", 1, solrEndpoint.getStreamingThreadCount());
+ assertEquals(5, solrEndpoint.getStreamingQueueSize(), "queue size incorrect");
+ assertEquals(1, solrEndpoint.getStreamingThreadCount(), "thread count incorrect");
assertNotNull(solrEndpoint);
}
@@ -35,13 +39,14 @@ public class InitSolrEndpointTest extends SolrTestSupport {
public void streamingEndpointCreatedCorrectly() throws Exception {
SolrEndpoint solrEndpoint = context.getEndpoint(solrUrl, SolrEndpoint.class);
assertNotNull(solrEndpoint);
- assertEquals("queue size incorrect", SolrConstants.DEFUALT_STREAMING_QUEUE_SIZE, solrEndpoint.getStreamingQueueSize());
- assertEquals("thread count incorrect", SolrConstants.DEFAULT_STREAMING_THREAD_COUNT, solrEndpoint.getStreamingThreadCount());
+ assertEquals(SolrConstants.DEFUALT_STREAMING_QUEUE_SIZE, solrEndpoint.getStreamingQueueSize(), "queue size incorrect");
+ assertEquals(SolrConstants.DEFAULT_STREAMING_THREAD_COUNT, solrEndpoint.getStreamingThreadCount(), "thread count incorrect");
}
- @Test(expected = ResolveEndpointFailedException.class)
+ @Test
public void wrongURLFormatFailsEndpointCreation() throws Exception {
- context.getEndpoint("solr://localhost:x99/solr");
+ assertThrows(ResolveEndpointFailedException.class,
+ () -> context.getEndpoint("solr://localhost:x99/solr"));
}
private String getFullOptions() {
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeanTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeanTest.java
index bd4a493..1db45f0 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeanTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeanTest.java
@@ -16,14 +16,12 @@
*/
package org.apache.camel.component.solr;
+import org.apache.camel.test.junit5.params.Test;
import org.apache.solr.client.solrj.beans.Field;
-import org.junit.Test;
-public class SolrAddBeanTest extends SolrComponentTestSupport {
+import static org.junit.jupiter.api.Assertions.assertEquals;
- public SolrAddBeanTest(SolrFixtures.TestServerType serverToTest) {
- super(serverToTest);
- }
+public class SolrAddBeanTest extends SolrComponentTestSupport {
@Test
public void testAddBean() throws Exception {
@@ -37,7 +35,7 @@ public class SolrAddBeanTest extends SolrComponentTestSupport {
template.sendBodyAndHeader("direct:start", null, SolrConstants.OPERATION, SolrConstants.OPERATION_COMMIT);
//verify
- assertEquals("wrong number of entries found", 1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
}
public class Item {
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeansTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeansTest.java
index 4a6cd1f..8b532da 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeansTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrAddBeansTest.java
@@ -19,14 +19,12 @@ package org.apache.camel.component.solr;
import java.util.ArrayList;
import java.util.List;
+import org.apache.camel.test.junit5.params.Test;
import org.apache.solr.client.solrj.beans.Field;
-import org.junit.Test;
-public class SolrAddBeansTest extends SolrComponentTestSupport {
+import static org.junit.jupiter.api.Assertions.assertEquals;
- public SolrAddBeansTest(SolrFixtures.TestServerType serverToTest) {
- super(serverToTest);
- }
+public class SolrAddBeansTest extends SolrComponentTestSupport {
@Test
public void testAddBeans() throws Exception {
@@ -49,9 +47,9 @@ public class SolrAddBeansTest extends SolrComponentTestSupport {
template.sendBodyAndHeader("direct:start", null, SolrConstants.OPERATION, SolrConstants.OPERATION_COMMIT);
//verify
- assertEquals("wrong number of entries found", 1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
- assertEquals("wrong number of entries found", 1, executeSolrQuery("id:" + TEST_ID2).getResults().getNumFound());
- assertEquals("wrong number of entries found", 2, executeSolrQuery("*:*").getResults().getNumFound());
+ assertEquals(1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
+ assertEquals(1, executeSolrQuery("id:" + TEST_ID2).getResults().getNumFound(), "wrong number of entries found");
+ assertEquals(2, executeSolrQuery("*:*").getResults().getNumFound(), "wrong number of entries found");
}
public class Item {
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
index 7bde762..cd0bab3 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
@@ -23,28 +23,27 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit5.params.Parameter;
+import org.apache.camel.test.junit5.params.Parameterized;
+import org.apache.camel.test.junit5.params.Parameters;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+
+@Parameterized
public abstract class SolrComponentTestSupport extends SolrTestSupport {
protected static final String TEST_ID = "test1";
protected static final String TEST_ID2 = "test2";
- private SolrFixtures solrFixtures;
+ @Parameter
+ SolrFixtures.TestServerType serverToTest;
- public SolrComponentTestSupport(SolrFixtures.TestServerType serverToTest) {
- this.solrFixtures = new SolrFixtures(serverToTest);
- }
+ SolrFixtures solrFixtures;
protected void solrInsertTestEntry() {
solrInsertTestEntry(TEST_ID);
@@ -54,8 +53,15 @@ public abstract class SolrComponentTestSupport extends SolrTestSupport {
return Arrays.asList(new Object[][] {{true}, {false}});
}
+ SolrFixtures getSolrFixtures() {
+ if (solrFixtures == null) {
+ solrFixtures = new SolrFixtures(serverToTest);
+ }
+ return solrFixtures;
+ }
+
String solrRouteUri() {
- return solrFixtures.solrRouteUri();
+ return getSolrFixtures().solrRouteUri();
}
protected void solrInsertTestEntry(String id) {
@@ -74,16 +80,16 @@ public abstract class SolrComponentTestSupport extends SolrTestSupport {
solrQuery.setQuery(query);
QueryRequest queryRequest = new QueryRequest(solrQuery);
queryRequest.setBasicAuthCredentials("solr", "SolrRocks");
- SolrClient solrServer = solrFixtures.getServer();
+ SolrClient solrServer = getSolrFixtures().getServer();
return queryRequest.process(solrServer, "collection1");
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws Exception {
SolrFixtures.createSolrFixtures();
}
- @AfterClass
+ @AfterAll
public static void afterClass() throws Exception {
SolrFixtures.teardownSolrFixtures();
}
@@ -112,7 +118,7 @@ public abstract class SolrComponentTestSupport extends SolrTestSupport {
return Arrays.asList(serverTypes);
}
- @Before
+ @BeforeEach
public void clearIndex() throws Exception {
SolrFixtures.clearIndex();
}
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrDeleteTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrDeleteTest.java
index 74afa11..22d1f3a 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrDeleteTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrDeleteTest.java
@@ -18,13 +18,11 @@ package org.apache.camel.component.solr;
import java.util.Arrays;
-import org.junit.Test;
+import org.apache.camel.test.junit5.params.Test;
-public class SolrDeleteTest extends SolrComponentTestSupport {
+import static org.junit.jupiter.api.Assertions.assertEquals;
- public SolrDeleteTest(SolrFixtures.TestServerType serverToTest) {
- super(serverToTest);
- }
+public class SolrDeleteTest extends SolrComponentTestSupport {
@Test
public void testDeleteById() throws Exception {
@@ -32,14 +30,14 @@ public class SolrDeleteTest extends SolrComponentTestSupport {
//insert, commit and verify
solrInsertTestEntry();
solrCommit();
- assertEquals("wrong number of entries found", 1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
//delete
template.sendBodyAndHeader("direct:start", TEST_ID, SolrConstants.OPERATION, SolrConstants.OPERATION_DELETE_BY_ID);
solrCommit();
//verify
- assertEquals("wrong number of entries found", 0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
}
@Test
@@ -49,13 +47,13 @@ public class SolrDeleteTest extends SolrComponentTestSupport {
solrInsertTestEntry(TEST_ID);
solrInsertTestEntry(TEST_ID2);
solrCommit();
- assertEquals("wrong number of entries found", 2, executeSolrQuery("id:test*").getResults().getNumFound());
+ assertEquals(2, executeSolrQuery("id:test*").getResults().getNumFound(), "wrong number of entries found");
//delete
template.sendBodyAndHeader("direct:splitThenCommit", Arrays.asList(TEST_ID, TEST_ID2), SolrConstants.OPERATION, SolrConstants.OPERATION_DELETE_BY_ID);
//verify
- assertEquals("wrong number of entries found", 0, executeSolrQuery("id:test*").getResults().getNumFound());
+ assertEquals(0, executeSolrQuery("id:test*").getResults().getNumFound(), "wrong number of entries found");
}
@Test
@@ -65,13 +63,13 @@ public class SolrDeleteTest extends SolrComponentTestSupport {
solrInsertTestEntry(TEST_ID);
solrInsertTestEntry(TEST_ID2);
solrCommit();
- assertEquals("wrong number of entries found", 2, executeSolrQuery("id:test*").getResults().getNumFound());
+ assertEquals(2, executeSolrQuery("id:test*").getResults().getNumFound(), "wrong number of entries found");
//delete
template.sendBodyAndHeader("direct:start", "id:test*", SolrConstants.OPERATION, SolrConstants.OPERATION_DELETE_BY_QUERY);
solrCommit();
//verify
- assertEquals("wrong number of entries found", 0, executeSolrQuery("id:test*").getResults().getNumFound());
+ assertEquals(0, executeSolrQuery("id:test*").getResults().getNumFound(), "wrong number of entries found");
}
}
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrServerMissingTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrServerMissingTest.java
index 84514f0..95c593d 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrServerMissingTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrServerMissingTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.solr;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SolrServerMissingTest extends SolrTestSupport {
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
index a11e271..60f310b 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.solr;
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;
public abstract class SolrTestSupport extends CamelTestSupport {
private static int port;
private static int httpsPort;
- @BeforeClass
+ @BeforeAll
public static void initPort() throws Exception {
port = AvailablePortFinder.getNextAvailable();
httpsPort = AvailablePortFinder.getNextAvailable();
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTransactionsTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTransactionsTest.java
index de3e5b4..4a0997f 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTransactionsTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTransactionsTest.java
@@ -17,40 +17,28 @@
package org.apache.camel.component.solr;
import org.apache.camel.CamelExecutionException;
+import org.apache.camel.test.junit5.params.Test;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.isA;
-import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+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 SolrTransactionsTest extends SolrComponentTestSupport {
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
- private SolrFixtures.TestServerType solrServerType;
-
- public SolrTransactionsTest(SolrFixtures.TestServerType solrServerType) {
- super(solrServerType);
- this.solrServerType = solrServerType;
- }
-
@Test
public void testCommit() throws Exception {
//insert and verify
solrInsertTestEntry();
- assertEquals("wrong number of entries found", 0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
//commit
template.sendBodyAndHeader("direct:start", null, SolrConstants.OPERATION, SolrConstants.OPERATION_COMMIT);
//verify exists after commit
- assertEquals("wrong number of entries found", 1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
}
@Test
@@ -58,41 +46,47 @@ public class SolrTransactionsTest extends SolrComponentTestSupport {
//insert and verify
solrInsertTestEntry();
- assertEquals("wrong number of entries found", 0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
//commit
template.sendBodyAndHeader("direct:start", null, SolrConstants.OPERATION, SolrConstants.OPERATION_SOFT_COMMIT);
//verify exists after commit
- assertEquals("wrong number of entries found", 1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
}
@Test
public void testRollback() throws Exception {
- if (SolrFixtures.TestServerType.USE_CLOUD == this.solrServerType) {
+ if (SolrFixtures.TestServerType.USE_CLOUD == getSolrFixtures().serverType) {
// Twisting expectations in this case as rollback is currently no
// more supported in SolrCloud mode. See SOLR-4895
- thrown.expect(CamelExecutionException.class);
- final String expectedMessagePart = "Rollback is currently not supported in SolrCloud mode. (SOLR-4895)";
- thrown.expectCause(allOf(isA(HttpSolrClient.RemoteSolrException.class), hasMessage(containsString(expectedMessagePart))));
+ Exception e = assertThrows(CamelExecutionException.class,
+ () -> doRollback());
+ assertIsInstanceOf(HttpSolrClient.RemoteSolrException.class, e.getCause());
+ assertTrue(e.getCause().getMessage().contains("Rollback is currently not supported in SolrCloud mode. (SOLR-4895)"));
+ } else {
+ doRollback();
}
+ }
+
+ protected void doRollback() throws Exception {
//insert and verify
solrInsertTestEntry();
- assertEquals("wrong number of entries found", 0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
//rollback
template.sendBodyAndHeader("direct:start", null, SolrConstants.OPERATION, SolrConstants.OPERATION_ROLLBACK);
//verify after rollback
- assertEquals("wrong number of entries found", 0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
//commit
template.sendBodyAndHeader("direct:start", null, SolrConstants.OPERATION, SolrConstants.OPERATION_COMMIT);
//verify after commit (again)
- assertEquals("wrong number of entries found", 0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
}
@Test
@@ -100,13 +94,13 @@ public class SolrTransactionsTest extends SolrComponentTestSupport {
//insert and verify
solrInsertTestEntry();
- assertEquals("wrong number of entries found", 0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(0, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
//optimize
template.sendBodyAndHeader("direct:start", null, SolrConstants.OPERATION, SolrConstants.OPERATION_OPTIMIZE);
//verify exists after optimize
- assertEquals("wrong number of entries found", 1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ assertEquals(1, executeSolrQuery("id:" + TEST_ID).getResults().getNumFound(), "wrong number of entries found");
}
}
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
index a5185e9..954d50d 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
@@ -22,25 +22,25 @@ import java.util.Arrays;
import java.util.List;
import org.apache.camel.Exchange;
+import org.apache.camel.test.junit5.params.Test;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.UpdateParams;
-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 static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class SolrUpdateTest extends SolrComponentTestSupport {
private SolrEndpoint solrEndpoint;
- public SolrUpdateTest(SolrFixtures.TestServerType serverToTest) {
- super(serverToTest);
- }
-
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
solrEndpoint = getMandatoryEndpoint(solrRouteUri(), SolrEndpoint.class);
@@ -304,7 +304,7 @@ public class SolrUpdateTest extends SolrComponentTestSupport {
}
@Test
- @Ignore("No real advantage has yet been discovered to specifying the file in a header.")
+ @Disabled("No real advantage has yet been discovered to specifying the file in a header.")
public void indexPDFDocumentSpecifyingFileInParameters() throws Exception {
solrEndpoint.setRequestHandler("/update/extract");
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java
index 62246be..e73cf82 100644
--- a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java
@@ -21,7 +21,9 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Comparator;
+import java.util.List;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.junit.jupiter.api.extension.Extension;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -50,10 +52,7 @@ public class ParameterizedExtension implements TestTemplateInvocationContextProv
public java.util.stream.Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(ExtensionContext extensionContext) {
Class<?> testClass = extensionContext.getRequiredTestClass();
try {
- java.util.List<Method> parameters = java.util.stream.Stream.of(testClass.getDeclaredMethods())
- .filter(m -> Modifier.isStatic(m.getModifiers()))
- .filter(m -> m.getAnnotation(Parameters.class) != null)
- .collect(Collectors.toList());
+ List<Method> parameters = getParametersMethods(testClass);
if (parameters.size() != 1) {
throw new IllegalStateException("Class " + testClass.getName() + " should provide a single method annotated with @" + Parameters.class.getSimpleName());
}
@@ -63,7 +62,19 @@ public class ParameterizedExtension implements TestTemplateInvocationContextProv
.map(Arguments::get)
.map(ParameterizedTemplate::new);
} catch (Exception e) {
- throw new IllegalStateException("Unable to generate test templates for class " + testClass.getName());
+ throw new IllegalStateException("Unable to generate test templates for class " + testClass.getName(), e);
+ }
+ }
+
+ private List<Method> getParametersMethods(Class<?> testClass) {
+ List<Method> parameters = java.util.stream.Stream.of(testClass.getDeclaredMethods())
+ .filter(m -> Modifier.isStatic(m.getModifiers()))
+ .filter(m -> m.getAnnotation(Parameters.class) != null)
+ .collect(Collectors.toList());
+ if (parameters.isEmpty() && testClass != null) {
+ return getParametersMethods(testClass.getSuperclass());
+ } else {
+ return parameters;
}
}
@@ -108,7 +119,9 @@ public class ParameterizedExtension implements TestTemplateInvocationContextProv
protected void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception {
Class<?> clazz = testInstance.getClass();
- java.util.List<Field> fields = java.util.stream.Stream.of(clazz.getDeclaredFields())
+ java.util.List<Field> fields = hierarchy(clazz)
+ .map(Class::getDeclaredFields)
+ .flatMap(Stream::of)
.filter(f -> isAnnotated(f, Parameter.class))
.sorted(Comparator.comparing(f -> (Integer) f.getAnnotation(Parameter.class).value()))
.collect(Collectors.toList());
@@ -122,6 +135,11 @@ public class ParameterizedExtension implements TestTemplateInvocationContextProv
}
}
+ protected Stream<Class<?>> hierarchy(Class<?> clazz) {
+ Class<?> superclass = clazz.getSuperclass();
+ return Stream.concat(Stream.of(clazz), superclass != null ? hierarchy(superclass) : Stream.empty());
+ }
+
}
}
[camel] 09/27: [CAMEL-11807] Upgrade camel-spring-integration 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 c3b284013ffddf5b30ad04d73dfba4b40a558dd9
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 10:48:08 2020 +0200
[CAMEL-11807] Upgrade camel-spring-integration to junit5
---
components/camel-spring-integration/pom.xml | 6 +++---
.../integration/SpringIntegrationMessageTest.java | 4 ++--
.../SpringIntegrationOneWayConsumerTest.java | 4 ++--
.../integration/SpringIntegrationProducerTest.java | 10 ++++++----
.../SpringIntegrationTwoWayConsumerTest.java | 9 ++++++---
.../integration/adapter/CamelSourceAdapterTest.java | 11 +++++++----
.../integration/adapter/CamelTargetAdapterTest.java | 11 +++++++----
.../spring/integration/adapter/ConfigurationTest.java | 19 ++++++++++---------
8 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml
index a4c1b39..88f4091 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -77,8 +77,8 @@
<!-- testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -93,7 +93,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-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationMessageTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationMessageTest.java
index c029852..ddc64fb 100644
--- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationMessageTest.java
+++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationMessageTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.spring.integration;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.messaging.support.MessageBuilder;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SpringIntegrationMessageTest {
diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
index 9230d3d..f2683cb 100644
--- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
+++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.spring.integration;
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.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.GenericMessage;
diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
index bdcd823..bcc0119 100644
--- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
+++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
@@ -16,17 +16,19 @@
*/
package org.apache.camel.component.spring.integration;
-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;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class SpringIntegrationProducerTest extends CamelSpringTestSupport {
@Test
public void testSendingTwoWayMessage() throws Exception {
String result = template.requestBody("direct:twowayMessage", "Willem", String.class);
- assertEquals("Can't get the right response", result, "Hello Willem");
+ assertEquals(result, "Hello Willem", "Can't get the right response");
}
@Test
@@ -34,7 +36,7 @@ public class SpringIntegrationProducerTest extends CamelSpringTestSupport {
template.sendBody("direct:onewayMessage", "Greet");
HelloWorldService service = getMandatoryBean(HelloWorldService.class, "helloService");
- assertEquals("We should call the service", service.getGreetName(), "Greet");
+ assertEquals(service.getGreetName(), "Greet", "We should call the service");
}
@Override
diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
index 65c7f7c..354abf5 100644
--- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
+++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
@@ -21,8 +21,8 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-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;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.messaging.Message;
@@ -31,6 +31,9 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.support.GenericMessage;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SpringIntegrationTwoWayConsumerTest extends CamelSpringTestSupport {
private static final String MESSAGE_BODY = "Request message";
@@ -47,7 +50,7 @@ public class SpringIntegrationTwoWayConsumerTest extends CamelSpringTestSupport
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
latch.countDown();
- assertEquals("Get the wrong result", MESSAGE_BODY + " is processed", message.getPayload());
+ assertEquals(MESSAGE_BODY + " is processed", message.getPayload(), "Get the wrong result");
assertEquals("Done", message.getHeaders().get("Status"));
}
});
diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
index dc09fa0..445928b 100644
--- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
+++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
@@ -19,13 +19,16 @@ package org.apache.camel.component.spring.integration.adapter;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-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;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class CamelSourceAdapterTest extends CamelSpringTestSupport {
@Test
@@ -35,7 +38,7 @@ public class CamelSourceAdapterTest extends CamelSpringTestSupport {
channelA.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
latch.countDown();
- assertEquals("We should get the message from channelA", message.getPayload(), "Willem");
+ assertEquals("Willem", message.getPayload(), "We should get the message from channelA");
}
});
@@ -48,7 +51,7 @@ public class CamelSourceAdapterTest extends CamelSpringTestSupport {
public void testSendingTwoWayMessage() throws Exception {
String result = template.requestBody("direct:TwoWay", "Willem", String.class);
- assertEquals("Can't get the right response", result, "Hello Willem");
+ assertEquals("Hello Willem", result, "Can't get the right response");
}
@Override
diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
index bebacf5..e29402b 100644
--- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
+++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
@@ -22,8 +22,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
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.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.messaging.Message;
@@ -32,6 +32,9 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.support.GenericMessage;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class CamelTargetAdapterTest extends CamelSpringTestSupport {
private static final String MESSAGE_BODY = "hello world";
@@ -57,7 +60,7 @@ public class CamelTargetAdapterTest extends CamelSpringTestSupport {
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
latch.countDown();
- assertEquals("Get the wrong result", MESSAGE_BODY + " is processed", message.getPayload());
+ assertEquals(MESSAGE_BODY + " is processed", message.getPayload(), "Get the wrong result");
}
});
@@ -77,7 +80,7 @@ public class CamelTargetAdapterTest extends CamelSpringTestSupport {
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
latch.countDown();
- assertEquals("Get the wrong result", MESSAGE_BODY + " is processed", message.getPayload());
+ assertEquals(MESSAGE_BODY + " is processed", message.getPayload(), "Get the wrong result");
}
});
diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
index bdd805f..7a09702 100644
--- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
+++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
@@ -17,20 +17,21 @@
package org.apache.camel.component.spring.integration.adapter;
import org.apache.camel.util.IOHelper;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConfigurationTest {
private AbstractXmlApplicationContext context;
- @After
+ @AfterEach
public void tearDown() {
IOHelper.close(context);
}
@@ -44,11 +45,11 @@ public class ConfigurationTest {
assertNotNull(camelSourceA);
assertTrue(camelSourceA.getChannel().toString().contains("channelA"));
- assertEquals("ExpectReply should be false ", camelSourceA.isExpectReply(), false);
+ assertFalse(camelSourceA.isExpectReply(), "ExpectReply should be false");
CamelSourceAdapter camelSourceB = context.getBean("camelSourceB", CamelSourceAdapter.class);
assertNotNull(camelSourceB);
assertTrue(camelSourceB.getChannel().toString().contains("channelB"));
- assertEquals("ExpectReply should be true ", camelSourceB.isExpectReply(), true);
+ assertTrue(camelSourceB.isExpectReply(), "ExpectReply should be true");
}
@Test
@@ -59,7 +60,7 @@ public class ConfigurationTest {
CamelTargetAdapter camelTargetA = context.getBean("camelTargetA", CamelTargetAdapter.class);
assertNotNull(camelTargetA);
- assertEquals("Subscript the wrong CamelEndpointUri", camelTargetA.getCamelEndpointUri(), "direct:EndpointA");
+ assertEquals("direct:EndpointA", camelTargetA.getCamelEndpointUri(), "Subscript the wrong CamelEndpointUri");
CamelTargetAdapter camelTargetB = context.getBean("camelTargetB", CamelTargetAdapter.class);
assertNotNull(camelTargetB);
assertTrue(camelTargetB.getReplyChannel().toString().contains("channelC"));
[camel] 10/27: [CAMEL-11807] Upgrade camel-spring-ldap 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 bb700b262d290d5286902ec9230137bdb9bbcdec
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 10:51:33 2020 +0200
[CAMEL-11807] Upgrade camel-spring-ldap to junit5
---
components/camel-spring-ldap/pom.xml | 4 +-
.../springldap/SpringLdapComponentTest.java | 11 +++---
.../springldap/SpringLdapProducerTest.java | 45 +++++++++++++---------
3 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/components/camel-spring-ldap/pom.xml b/components/camel-spring-ldap/pom.xml
index 1e3cd66..01d8708 100644
--- a/components/camel-spring-ldap/pom.xml
+++ b/components/camel-spring-ldap/pom.xml
@@ -73,12 +73,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>
diff --git a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java
index c471549..f052a3e 100644
--- a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java
+++ b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapComponentTest.java
@@ -28,23 +28,24 @@ import javax.naming.directory.SearchControls;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.mockito.Captor;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.ldap.core.AttributesMapper;
import org.springframework.ldap.core.LdapTemplate;
+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.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings
public class SpringLdapComponentTest extends CamelSpringTestSupport {
private LdapTemplate ldapTemplate;
diff --git a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
index c244b50..04acd20 100644
--- a/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
+++ b/components/camel-spring-ldap/src/test/java/org/apache/camel/component/springldap/SpringLdapProducerTest.java
@@ -30,25 +30,26 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultMessage;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
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.ldap.core.AttributesMapper;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.core.LdapTemplate;
import org.springframework.ldap.query.LdapQuery;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class SpringLdapProducerTest extends CamelTestSupport {
@Mock
@@ -60,37 +61,40 @@ public class SpringLdapProducerTest extends CamelTestSupport {
private SpringLdapProducer ldapProducer;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
when(ldapEndpoint.getLdapTemplate()).thenReturn(ldapTemplate);
ldapProducer = new SpringLdapProducer(ldapEndpoint);
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testEmptyExchange() throws Exception {
Exchange exchange = new DefaultExchange(context);
- ldapProducer.process(exchange);
+ assertThrows(UnsupportedOperationException.class,
+ () -> ldapProducer.process(exchange));
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testWrongBodyType() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
in.setBody("");
exchange.setIn(in);
- ldapProducer.process(exchange);
+ assertThrows(UnsupportedOperationException.class,
+ () -> ldapProducer.process(exchange));
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testNoDN() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
Map<String, Object> body = new HashMap<>();
- processBody(exchange, in, body);
+ assertThrows(UnsupportedOperationException.class,
+ () -> processBody(exchange, in, body));
}
@Test
@@ -112,7 +116,7 @@ public class SpringLdapProducerTest extends CamelTestSupport {
ldapProducer.process(exchange);
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testEmptyDN() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
@@ -120,10 +124,11 @@ public class SpringLdapProducerTest extends CamelTestSupport {
Map<String, Object> body = new HashMap<>();
body.put(SpringLdapProducer.DN, "");
- processBody(exchange, in, body);
+ assertThrows(UnsupportedOperationException.class,
+ () -> processBody(exchange, in, body));
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testNullDN() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
@@ -131,10 +136,11 @@ public class SpringLdapProducerTest extends CamelTestSupport {
Map<String, Object> body = new HashMap<>();
body.put(SpringLdapProducer.DN, null);
- processBody(exchange, in, body);
+ assertThrows(UnsupportedOperationException.class,
+ () -> processBody(exchange, in, body));
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testNullOperation() throws Exception {
Exchange exchange = new DefaultExchange(context);
Message in = new DefaultMessage(context);
@@ -142,7 +148,8 @@ public class SpringLdapProducerTest extends CamelTestSupport {
Map<String, Object> body = new HashMap<>();
body.put(SpringLdapProducer.DN, " ");
- processBody(exchange, in, body);
+ assertThrows(UnsupportedOperationException.class,
+ () -> processBody(exchange, in, body));
}
@Test