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/18 11:37:53 UTC
[camel] branch master updated (4554e17 -> db8f2d9)
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 4554e17 Regen
new 8ec39b8 [CAMEL-11807] Upgrade camel-milo to junit5
new b78ef44 [CAMEL-11807] Upgrade camel-nsq to junit5
new da45945 [CAMEL-11807] Upgrade camel-ognl to junit5
new 561c60a [CAMEL-11807] Upgrade camel-opentracing to junit5
new fd88a83 [CAMEL-11807] Upgrade camel-paho to junit5
new fb07bc0 [CAMEL-11807] Upgrade camel-pdf to junit5
new 35b2029 [CAMEL-11807] Upgrade camel-pgevent to junit5
new 6144fb1 [CAMEL-11807] Upgrade camel-pg-replication-slot to junit5
new b5a631d [CAMEL-11807] Upgrade camel-protobuf to junit5
new e269218 [CAMEL-11807] Upgrade camel-pubnub to junit5
new db8f2d9 [CAMEL-11807] Upgrade camel-opentracing to junit5
The 11 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-milo/pom.xml | 6 ++---
.../component/milo/AbstractMiloServerTest.java | 11 ++++++---
.../milo/MonitorItemMultiConnectionsCertTest.java | 2 +-
.../milo/MonitorItemMultiConnectionsTest.java | 2 +-
.../camel/component/milo/MonitorItemTest.java | 2 +-
.../camel/component/milo/WriteClientTest.java | 2 +-
.../camel/component/milo/call/CallClientTest.java | 13 ++++++-----
.../camel/component/milo/client/NodeIdTest.java | 10 +++++---
.../component/milo/converter/ConverterTest.java | 19 ++++++++-------
.../component/milo/server/ServerLocalTest.java | 8 +++----
.../server/ServerSetCertificateManagerTest.java | 2 +-
.../milo/server/ServerSetSecurityPoliciesTest.java | 4 ++--
components/camel-nsq/pom.xml | 4 ++--
.../camel/component/nsq/NsqConsumerTest.java | 4 +++-
.../camel/component/nsq/NsqProducerTest.java | 4 +++-
.../apache/camel/component/nsq/NsqTestSupport.java | 4 ++--
components/camel-ognl/pom.xml | 6 ++---
.../camel/language/ognl/OgnlInvokeMethodTest.java | 4 ++--
.../camel/language/ognl/OgnlResourceTest.java | 4 ++--
.../org/apache/camel/language/ognl/OgnlTest.java | 10 +++++---
.../camel/language/ognl/patterns/FilterTest.java | 4 ++--
components/camel-opentracing/pom.xml | 4 ++--
.../src/main/docs/opentracing.adoc | 4 ----
.../opentracing/decorators/NsqSpanDecorator.java | 1 -
.../org/apache/camel/opentracing/ABCRouteTest.java | 2 +-
.../camel/opentracing/ActiveSpanManagerTest.java | 7 ++++--
.../opentracing/CamelOpenTracingTestSupport.java | 27 +++++++++++-----------
.../opentracing/ClientRecipientListRouteTest.java | 2 +-
.../opentracing/CustomComponentNameRouteTest.java | 2 +-
.../opentracing/MulticastParallelRouteTest.java | 2 +-
.../camel/opentracing/MulticastRouteTest.java | 2 +-
.../OpentracingSpanCollectorInRegistryTest.java | 7 ++++--
.../camel/opentracing/RouteConcurrentTest.java | 4 +++-
.../camel/opentracing/SpanProcessorsTest.java | 5 ++--
.../SpringOpenTracingSimpleRouteTest.java | 7 ++++--
.../apache/camel/opentracing/TwoServiceTest.java | 2 +-
.../opentracing/TwoServiceWithExcludeTest.java | 2 +-
.../agent/InstallOpenTracingTracerRuleTest.java | 14 ++++++-----
.../decorators/AbstractHttpSpanDecoratorTest.java | 6 ++---
.../AbstractMessagingSpanDecoratorTest.java | 4 ++--
.../decorators/AbstractSpanDecoratorTest.java | 4 ++--
.../decorators/AwsSnsSpanDecoratorTest.java | 4 ++--
.../decorators/AwsSqsSpanDecoratorTest.java | 4 ++--
.../decorators/CometdSpanDecoratorTest.java | 4 ++--
.../decorators/CqlSpanDecoratorTest.java | 6 ++---
.../decorators/ElasticsearchSpanDecoratorTest.java | 4 ++--
.../decorators/IronmqSpanDecoratorTest.java | 4 ++--
.../decorators/JdbcSpanDecoratorTest.java | 4 ++--
.../decorators/JmsSpanDecoratorTest.java | 4 ++--
.../decorators/KafkaSpanDecoratorTest.java | 4 ++--
.../decorators/MongoDBSpanDecoratorTest.java | 6 ++---
.../decorators/RestSpanDecoratorTest.java | 6 ++---
.../decorators/SqlSpanDecoratorTest.java | 4 ++--
.../decorators/StompSpanDecoratorTest.java | 4 ++--
.../decorators/TimerSpanDecoratorTest.java | 4 ++--
.../CamelMessagingHeadersExtractAdapterTest.java | 10 ++++----
.../CamelMessagingHeadersInjectAdapterTest.java | 18 ++++++---------
components/camel-paho/pom.xml | 2 +-
.../camel/component/paho/PahoComponentTest.java | 11 +++++----
.../paho/PahoComponentVerifierExtensionTest.java | 11 +++++----
.../component/paho/PahoOverrideTopicTest.java | 8 +++----
components/camel-pdf/pom.xml | 6 ++---
.../apache/camel/component/pdf/PdfAppendTest.java | 10 ++++----
.../camel/component/pdf/PdfCreationTest.java | 16 ++++++++-----
.../camel/component/pdf/PdfTextExtractionTest.java | 5 ++--
.../pdf/text/PatternSplitStrategyTest.java | 4 ++--
.../component/pdf/text/WordSplitStrategyTest.java | 4 ++--
components/camel-pg-replication-slot/pom.xml | 4 ++--
.../slot/PgReplicationSlotEndpointTest.java | 22 +++++++-----------
.../PgReplicationSlotIntegrationTest.java | 12 +++++-----
components/camel-pgevent/pom.xml | 4 ++--
.../apache/camel/pgevent/PgEventConsumerTest.java | 10 ++++----
.../apache/camel/pgevent/PgEventHelperTest.java | 24 ++++++++-----------
.../apache/camel/pgevent/PgEventProducerTest.java | 16 +++++++------
.../AbstractPgEventIntegrationTest.java | 2 +-
.../integration/PgEventPubSubIntegrationTest.java | 2 +-
...gEventWithDefinedDatasourceIntegrationTest.java | 2 +-
components/camel-protobuf/pom.xml | 6 ++---
.../dataformat/protobuf/ProtobufConverterTest.java | 16 ++++++++-----
.../ProtobufMarshalAndUnmarshalJsonTest.java | 6 +++--
.../ProtobufMarshalAndUnmarshalMapTest.java | 6 +++--
.../ProtobufMarshalAndUnmarshalSpringTest.java | 10 +++++---
.../protobuf/ProtobufMarshalAndUnmarshalTest.java | 10 +++++---
components/camel-pubnub/pom.xml | 8 +++++--
.../component/pubnub/PubNubConfigurationTest.java | 14 +++++++----
.../camel/component/pubnub/PubNubFireTest.java | 2 +-
.../component/pubnub/PubNubOperationsTest.java | 5 +++-
.../camel/component/pubnub/PubNubPresenceTest.java | 3 ++-
.../camel/component/pubnub/PubNubPublishTest.java | 8 ++++---
.../component/pubnub/PubNubSubscriberTest.java | 2 +-
.../camel/component/pubnub/PubNubTestBase.java | 25 ++++++++------------
.../pubnub/example/PubNubStateExample.java | 10 ++++----
92 files changed, 343 insertions(+), 286 deletions(-)
[camel] 04/11: [CAMEL-11807] Upgrade camel-opentracing 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 561c60a02825b6cc470ac9907acb6ba98b8351cf
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 15:40:31 2020 +0200
[CAMEL-11807] Upgrade camel-opentracing to junit5
---
components/camel-opentracing/pom.xml | 4 ++--
.../src/main/docs/opentracing.adoc | 4 ----
.../opentracing/decorators/NsqSpanDecorator.java | 1 -
.../org/apache/camel/opentracing/ABCRouteTest.java | 2 +-
.../camel/opentracing/ActiveSpanManagerTest.java | 7 ++++--
.../opentracing/CamelOpenTracingTestSupport.java | 27 +++++++++++-----------
.../opentracing/ClientRecipientListRouteTest.java | 2 +-
.../opentracing/CustomComponentNameRouteTest.java | 2 +-
.../opentracing/MulticastParallelRouteTest.java | 2 +-
.../camel/opentracing/MulticastRouteTest.java | 2 +-
.../OpentracingSpanCollectorInRegistryTest.java | 7 ++++--
.../camel/opentracing/RouteConcurrentTest.java | 4 +++-
.../SpringOpenTracingSimpleRouteTest.java | 7 ++++--
.../apache/camel/opentracing/TwoServiceTest.java | 2 +-
.../opentracing/TwoServiceWithExcludeTest.java | 2 +-
.../agent/InstallOpenTracingTracerRuleTest.java | 14 ++++++-----
.../decorators/AbstractHttpSpanDecoratorTest.java | 6 ++---
.../AbstractMessagingSpanDecoratorTest.java | 4 ++--
.../decorators/AbstractSpanDecoratorTest.java | 4 ++--
.../decorators/AwsSnsSpanDecoratorTest.java | 4 ++--
.../decorators/AwsSqsSpanDecoratorTest.java | 4 ++--
.../decorators/CometdSpanDecoratorTest.java | 4 ++--
.../decorators/CqlSpanDecoratorTest.java | 6 ++---
.../decorators/ElasticsearchSpanDecoratorTest.java | 4 ++--
.../decorators/IronmqSpanDecoratorTest.java | 4 ++--
.../decorators/JdbcSpanDecoratorTest.java | 4 ++--
.../decorators/JmsSpanDecoratorTest.java | 4 ++--
.../decorators/KafkaSpanDecoratorTest.java | 4 ++--
.../decorators/MongoDBSpanDecoratorTest.java | 6 ++---
.../decorators/RestSpanDecoratorTest.java | 6 ++---
.../decorators/SqlSpanDecoratorTest.java | 4 ++--
.../decorators/StompSpanDecoratorTest.java | 4 ++--
.../decorators/TimerSpanDecoratorTest.java | 4 ++--
.../CamelMessagingHeadersExtractAdapterTest.java | 10 ++++----
.../CamelMessagingHeadersInjectAdapterTest.java | 18 ++++++---------
35 files changed, 98 insertions(+), 95 deletions(-)
diff --git a/components/camel-opentracing/pom.xml b/components/camel-opentracing/pom.xml
index 3f0680f..daea749 100644
--- a/components/camel-opentracing/pom.xml
+++ b/components/camel-opentracing/pom.xml
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -88,7 +88,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-opentracing/src/main/docs/opentracing.adoc b/components/camel-opentracing/src/main/docs/opentracing.adoc
index 7bd4cc1..e66884b 100644
--- a/components/camel-opentracing/src/main/docs/opentracing.adoc
+++ b/components/camel-opentracing/src/main/docs/opentracing.adoc
@@ -16,7 +16,6 @@ to/from Camel.
See the http://opentracing.io/[OpenTracing] website for a list of supported tracers.
-
== Configuration
The configuration properties for the OpenTracing tracer are:
@@ -33,7 +32,6 @@ Dashes need for instances to be encoded for JMS property keys.
|=======================================================================
-
There are three ways in which an OpenTracing tracer can be configured to provide distributed tracing for a Camel application:
=== Explicit
@@ -73,7 +71,6 @@ the main class with `@CamelOpenTracing`.
The `Tracer` will be implicitly obtained from the camel context's `Registry`, or the `ServiceLoader`, unless
a `Tracer` bean has been defined by the application.
-
== Java Agent
The third approach is to use a Java Agent to automatically configure the OpenTracing support.
@@ -93,7 +90,6 @@ The OpenTracing Java Agent is associated with the following dependency:
IMPORTANT: It is necessary to use an OpenTracing compliant tracer that is
compatible with OpenTracing Java API version 0.31 or higher.
-
The `Tracer` used will be implicitly loaded from the camel context `Registry` or using the `ServiceLoader`.
How this agent is used will be specific to how you execute your application. _Service2_ in the https://github.com/apache/camel-spring-boot-examples/tree/master/camel-example-spring-boot-opentracing[camel-example-spring-boot-opentracing] downloads the agent into a local folder and then uses the `exec-maven-plugin` to launch the service with the `-javaagent` command line option.
diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/NsqSpanDecorator.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/NsqSpanDecorator.java
index 9f2d8dd..aeb8d38 100644
--- a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/NsqSpanDecorator.java
+++ b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/NsqSpanDecorator.java
@@ -36,7 +36,6 @@ public class NsqSpanDecorator extends AbstractMessagingSpanDecorator {
return "org.apache.camel.component.nsq.NsqComponent";
}
-
@Override
public String getDestination(Exchange exchange, Endpoint endpoint) {
String topic = (String)exchange.getIn().getHeader(NSQ_TOPIC);
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ABCRouteTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ABCRouteTest.java
index cc39f82..20d9ff3 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ABCRouteTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ABCRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.opentracing;
import io.opentracing.tag.Tags;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ABCRouteTest extends CamelOpenTracingTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ActiveSpanManagerTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ActiveSpanManagerTest.java
index 3a44570..d4b3335 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ActiveSpanManagerTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ActiveSpanManagerTest.java
@@ -19,8 +19,11 @@ package org.apache.camel.opentracing;
import io.opentracing.Span;
import io.opentracing.mock.MockTracer;
import org.apache.camel.Exchange;
-import org.apache.camel.test.junit4.ExchangeTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.ExchangeTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ActiveSpanManagerTest extends ExchangeTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/CamelOpenTracingTestSupport.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/CamelOpenTracingTestSupport.java
index 0faec13..84df2b6 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/CamelOpenTracingTestSupport.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/CamelOpenTracingTestSupport.java
@@ -32,7 +32,11 @@ import io.opentracing.mock.MockTracer;
import io.opentracing.mock.MockTracer.Propagator;
import io.opentracing.tag.Tags;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
+
+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 CamelOpenTracingTestSupport extends CamelTestSupport {
@@ -77,7 +81,7 @@ public class CamelOpenTracingTestSupport extends CamelTestSupport {
}
protected void verify(boolean async) {
- assertEquals("Incorrect number of spans", testdata.length, tracer.finishedSpans().size());
+ assertEquals(testdata.length, tracer.finishedSpans().size(), "Incorrect number of spans");
verifySameTrace();
@@ -86,7 +90,7 @@ public class CamelOpenTracingTestSupport extends CamelTestSupport {
final List<MockSpan> unsortedSpans = spans;
spans = Arrays.asList(testdata).stream()
.map(td -> findSpan(td, unsortedSpans)).distinct().collect(Collectors.toList());
- assertEquals("Incorrect number of spans after sorting", testdata.length, spans.size());
+ assertEquals(testdata.length, spans.size(), "Incorrect number of spans after sorting");
}
for (int i = 0; i < testdata.length; i++) {
@@ -106,10 +110,8 @@ public class CamelOpenTracingTestSupport extends CamelTestSupport {
String component = (String) span.tags().get(Tags.COMPONENT.getKey());
assertNotNull(component);
- assertEquals(td.getLabel(),
- SpanDecorator.CAMEL_COMPONENT + URI.create(td.getUri()).getScheme(),
- component);
- assertEquals(td.getLabel(), td.getUri(), span.tags().get("camel.uri"));
+ assertEquals(SpanDecorator.CAMEL_COMPONENT + URI.create(td.getUri()).getScheme(), component, td.getLabel());
+ assertEquals(td.getUri(), span.tags().get("camel.uri"), td.getLabel());
// If span associated with TestSEDASpanDecorator, check that pre/post tags have been defined
if ("camel-seda".equals(component)) {
@@ -117,19 +119,16 @@ public class CamelOpenTracingTestSupport extends CamelTestSupport {
assertTrue(span.tags().containsKey("post"));
}
- assertEquals(td.getLabel(), td.getOperation(), span.operationName());
+ assertEquals(td.getOperation(), span.operationName(), td.getLabel());
- assertEquals(td.getLabel(), td.getKind(),
- span.tags().get(Tags.SPAN_KIND.getKey()));
+ assertEquals(td.getKind(), span.tags().get(Tags.SPAN_KIND.getKey()), td.getLabel());
if (td.getParentId() != -1) {
- assertEquals(td.getLabel(),
- spans.get(td.getParentId()).context().spanId(),
- span.parentId());
+ assertEquals(spans.get(td.getParentId()).context().spanId(), span.parentId(), td.getLabel());
}
if (!td.getLogMessages().isEmpty()) {
- assertEquals("Number of log messages", td.getLogMessages().size(), span.logEntries().size());
+ assertEquals(td.getLogMessages().size(), span.logEntries().size(), "Number of log messages");
for (int i = 0; i < td.getLogMessages().size(); i++) {
assertEquals(td.getLogMessages().get(i), span.logEntries().get(i).fields().get("message"));
}
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ClientRecipientListRouteTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ClientRecipientListRouteTest.java
index 0f6dbc6..3ef2549 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ClientRecipientListRouteTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/ClientRecipientListRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.opentracing;
import io.opentracing.tag.Tags;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ClientRecipientListRouteTest extends CamelOpenTracingTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/CustomComponentNameRouteTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/CustomComponentNameRouteTest.java
index c68929c..c9dc292 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/CustomComponentNameRouteTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/CustomComponentNameRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.opentracing;
import io.opentracing.tag.Tags;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class CustomComponentNameRouteTest extends CamelOpenTracingTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/MulticastParallelRouteTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/MulticastParallelRouteTest.java
index d854851..ba914bb 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/MulticastParallelRouteTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/MulticastParallelRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.opentracing;
import io.opentracing.tag.Tags;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class MulticastParallelRouteTest extends CamelOpenTracingTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/MulticastRouteTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/MulticastRouteTest.java
index 4905c76..4ca5031 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/MulticastRouteTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/MulticastRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.opentracing;
import io.opentracing.tag.Tags;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class MulticastRouteTest extends CamelOpenTracingTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
index 9fcc19d..fe12c39 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
@@ -20,8 +20,11 @@ import io.opentracing.noop.NoopTracer;
import io.opentracing.noop.NoopTracerFactory;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class OpentracingSpanCollectorInRegistryTest extends CamelTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/RouteConcurrentTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/RouteConcurrentTest.java
index fdca53f..abc0c57 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/RouteConcurrentTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/RouteConcurrentTest.java
@@ -22,7 +22,9 @@ import io.opentracing.tag.Tags;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
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 RouteConcurrentTest extends CamelOpenTracingTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpringOpenTracingSimpleRouteTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpringOpenTracingSimpleRouteTest.java
index 20ab2a8..5640618 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpringOpenTracingSimpleRouteTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpringOpenTracingSimpleRouteTest.java
@@ -20,11 +20,14 @@ import java.util.concurrent.TimeUnit;
import io.opentracing.mock.MockTracer;
import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SpringOpenTracingSimpleRouteTest extends CamelSpringTestSupport {
@Override
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/TwoServiceTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/TwoServiceTest.java
index 7d674e9..8cb70a5 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/TwoServiceTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/TwoServiceTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.opentracing;
import io.opentracing.tag.Tags;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TwoServiceTest extends CamelOpenTracingTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/TwoServiceWithExcludeTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/TwoServiceWithExcludeTest.java
index c76ecea..0da4061 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/TwoServiceWithExcludeTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/TwoServiceWithExcludeTest.java
@@ -22,7 +22,7 @@ import java.util.Set;
import io.opentracing.tag.Tags;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TwoServiceWithExcludeTest extends CamelOpenTracingTestSupport {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java
index c549810..ec2860c 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java
@@ -28,12 +28,14 @@ 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.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled
public class InstallOpenTracingTracerRuleTest extends CamelTestSupport {
@BindToRegistry("tracer")
@@ -45,7 +47,7 @@ public class InstallOpenTracingTracerRuleTest extends CamelTestSupport {
@Produce("direct:start")
protected ProducerTemplate template;
- @Before
+ @BeforeEach
public void init() {
tracer.reset();
}
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecoratorTest.java
index 85ff71c..566cfba 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractHttpSpanDecoratorTest.java
@@ -23,11 +23,11 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AbstractHttpSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractMessagingSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractMessagingSpanDecoratorTest.java
index 90f1762..de1fb93 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractMessagingSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractMessagingSpanDecoratorTest.java
@@ -22,10 +22,10 @@ import io.opentracing.tag.Tags;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AbstractMessagingSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractSpanDecoratorTest.java
index 5a20ad6..222668d 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AbstractSpanDecoratorTest.java
@@ -22,10 +22,10 @@ import io.opentracing.tag.Tags;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AbstractSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AwsSnsSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AwsSnsSpanDecoratorTest.java
index b774070..7906bef 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AwsSnsSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AwsSnsSpanDecoratorTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.opentracing.decorators;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AwsSnsSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AwsSqsSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AwsSqsSpanDecoratorTest.java
index 1405df5..7d70ef6 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AwsSqsSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/AwsSqsSpanDecoratorTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.opentracing.decorators;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AwsSqsSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/CometdSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/CometdSpanDecoratorTest.java
index d11f04d..1800f9a 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/CometdSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/CometdSpanDecoratorTest.java
@@ -17,10 +17,10 @@
package org.apache.camel.opentracing.decorators;
import org.apache.camel.Endpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class CometdSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/CqlSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/CqlSpanDecoratorTest.java
index e85c68f..cb83bfd 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/CqlSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/CqlSpanDecoratorTest.java
@@ -23,11 +23,11 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class CqlSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/ElasticsearchSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/ElasticsearchSpanDecoratorTest.java
index b2d84a0..13f2b6b 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/ElasticsearchSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/ElasticsearchSpanDecoratorTest.java
@@ -23,10 +23,10 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ElasticsearchSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/IronmqSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/IronmqSpanDecoratorTest.java
index 2fa8426..0b385a3 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/IronmqSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/IronmqSpanDecoratorTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.opentracing.decorators;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class IronmqSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JdbcSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JdbcSpanDecoratorTest.java
index 7356364..a860fe4 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JdbcSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JdbcSpanDecoratorTest.java
@@ -23,10 +23,10 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JdbcSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JmsSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JmsSpanDecoratorTest.java
index e0fe654..afcab81 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JmsSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/JmsSpanDecoratorTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.opentracing.decorators;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/KafkaSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/KafkaSpanDecoratorTest.java
index d46c758..870a39d 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/KafkaSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/KafkaSpanDecoratorTest.java
@@ -22,10 +22,10 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class KafkaSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecoratorTest.java
index 07cd441..2041857 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/MongoDBSpanDecoratorTest.java
@@ -23,11 +23,11 @@ import io.opentracing.mock.MockTracer;
import io.opentracing.tag.Tags;
import org.apache.camel.Endpoint;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MongoDBSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/RestSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/RestSpanDecoratorTest.java
index 7099055..377e106 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/RestSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/RestSpanDecoratorTest.java
@@ -24,11 +24,11 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RestSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/SqlSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/SqlSpanDecoratorTest.java
index 26849dd..f695dfd 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/SqlSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/SqlSpanDecoratorTest.java
@@ -23,10 +23,10 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SqlSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/StompSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/StompSpanDecoratorTest.java
index 202cac0..4412537 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/StompSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/StompSpanDecoratorTest.java
@@ -17,10 +17,10 @@
package org.apache.camel.opentracing.decorators;
import org.apache.camel.Endpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StompSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/TimerSpanDecoratorTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/TimerSpanDecoratorTest.java
index 1e81c75..ecfb8cc 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/TimerSpanDecoratorTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/decorators/TimerSpanDecoratorTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.opentracing.decorators;
import org.apache.camel.Exchange;
import org.apache.camel.opentracing.SpanDecorator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class TimerSpanDecoratorTest {
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersExtractAdapterTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersExtractAdapterTest.java
index 53dfff1..980a546 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersExtractAdapterTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersExtractAdapterTest.java
@@ -20,18 +20,18 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-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.opentracing.propagation.CamelMessagingHeadersInjectAdapter.JMS_DASH;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class CamelMessagingHeadersExtractAdapterTest {
private Map<String, Object> map;
- @Before
+ @BeforeEach
public void before() {
map = new HashMap<>();
}
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersInjectAdapterTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersInjectAdapterTest.java
index fa1fb2d..5b8326d 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersInjectAdapterTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersInjectAdapterTest.java
@@ -19,22 +19,18 @@ package org.apache.camel.opentracing.propagation;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.opentracing.propagation.CamelMessagingHeadersInjectAdapter.JMS_DASH;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class CamelMessagingHeadersInjectAdapterTest {
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
private Map<String, Object> map;
- @Before
+ @BeforeEach
public void before() {
map = new HashMap<>();
}
@@ -42,8 +38,8 @@ public class CamelMessagingHeadersInjectAdapterTest {
@Test
public void cannotGetIterator() {
CamelMessagingHeadersInjectAdapter adapter = new CamelMessagingHeadersInjectAdapter(map, true);
- thrown.expect(UnsupportedOperationException.class);
- adapter.iterator();
+ assertThrows(UnsupportedOperationException.class,
+ () -> adapter.iterator());
}
@Test
[camel] 07/11: [CAMEL-11807] Upgrade camel-pgevent 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 35b2029f776d4d13aa8173d766d9582a122d12b4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 16:04:42 2020 +0200
[CAMEL-11807] Upgrade camel-pgevent to junit5
---
components/camel-pgevent/pom.xml | 4 ++--
.../apache/camel/pgevent/PgEventConsumerTest.java | 10 ++++-----
.../apache/camel/pgevent/PgEventHelperTest.java | 24 +++++++++-------------
.../apache/camel/pgevent/PgEventProducerTest.java | 16 ++++++++-------
.../AbstractPgEventIntegrationTest.java | 2 +-
.../integration/PgEventPubSubIntegrationTest.java | 2 +-
...gEventWithDefinedDatasourceIntegrationTest.java | 2 +-
7 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml
index e8602c9..edfaf2d 100644
--- a/components/camel-pgevent/pom.xml
+++ b/components/camel-pgevent/pom.xml
@@ -49,12 +49,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-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-pgevent/src/test/java/org/apache/camel/pgevent/PgEventConsumerTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventConsumerTest.java
index fa39c62..82ff432 100644
--- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventConsumerTest.java
+++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventConsumerTest.java
@@ -25,16 +25,16 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.component.pgevent.PgEventConsumer;
import org.apache.camel.component.pgevent.PgEventEndpoint;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class PgEventConsumerTest {
@Test
diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventHelperTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventHelperTest.java
index 5bfe2a9..c144786 100644
--- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventHelperTest.java
+++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventHelperTest.java
@@ -20,26 +20,22 @@ import java.sql.Connection;
import com.impossibl.postgres.api.jdbc.PGConnection;
import org.apache.camel.component.pgevent.PgEventHelper;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class PgEventHelperTest {
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
@Test
public void testToPGConnectionWithNullConnection() throws Exception {
- expectedException.expect(IllegalArgumentException.class);
- PgEventHelper.toPGConnection(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> PgEventHelper.toPGConnection(null));
}
@Test
@@ -61,9 +57,9 @@ public class PgEventHelperTest {
@Test
public void testToPGConnectionWithInvalidWrappedConnection() throws Exception {
- expectedException.expect(IllegalStateException.class);
Connection wrapperConnection = mock(Connection.class);
when(wrapperConnection.isWrapperFor(PGConnection.class)).thenReturn(false);
- PgEventHelper.toPGConnection(wrapperConnection);
+ assertThrows(IllegalStateException.class,
+ () -> PgEventHelper.toPGConnection(wrapperConnection));
}
}
diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventProducerTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventProducerTest.java
index d2dc345..439013a 100644
--- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventProducerTest.java
+++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/PgEventProducerTest.java
@@ -27,17 +27,18 @@ import org.apache.camel.Message;
import org.apache.camel.component.pgevent.InvalidStateException;
import org.apache.camel.component.pgevent.PgEventEndpoint;
import org.apache.camel.component.pgevent.PgEventProducer;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentMatchers;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class PgEventProducerTest {
private PgEventEndpoint endpoint = mock(PgEventEndpoint.class);
@@ -71,7 +72,7 @@ public class PgEventProducerTest {
assertTrue(producer.isStopped());
}
- @Test(expected = InvalidStateException.class)
+ @Test
public void testPgEventProducerProcessDbThrowsInvalidStateException() throws Exception {
when(endpoint.getDatasource()).thenReturn(dataSource);
when(dataSource.getConnection()).thenReturn(connection);
@@ -79,7 +80,8 @@ public class PgEventProducerTest {
PgEventProducer producer = new PgEventProducer(endpoint);
producer.start();
- producer.process(exchange);
+ assertThrows(InvalidStateException.class,
+ () -> producer.process(exchange));
}
@Test
diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/AbstractPgEventIntegrationTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/AbstractPgEventIntegrationTest.java
index dbede14..89e0214 100644
--- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/AbstractPgEventIntegrationTest.java
+++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/AbstractPgEventIntegrationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.pgevent.integration;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
public class AbstractPgEventIntegrationTest extends CamelTestSupport {
diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java
index ae8c954..8a38e79 100644
--- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java
+++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.RoutesBuilder;
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 PgEventPubSubIntegrationTest extends AbstractPgEventIntegrationTest {
diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
index 4ecbcac..3138eaf 100644
--- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
+++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.RoutesBuilder;
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 PgEventWithDefinedDatasourceIntegrationTest extends AbstractPgEventIntegrationTest {
[camel] 05/11: [CAMEL-11807] Upgrade camel-paho 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 fd88a83f8ffbc05a8835dd11defe4f0bdfee962a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 15:46:08 2020 +0200
[CAMEL-11807] Upgrade camel-paho to junit5
---
components/camel-paho/pom.xml | 2 +-
.../org/apache/camel/component/paho/PahoComponentTest.java | 11 +++++++----
.../component/paho/PahoComponentVerifierExtensionTest.java | 11 ++++++-----
.../apache/camel/component/paho/PahoOverrideTopicTest.java | 8 ++++----
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/components/camel-paho/pom.xml b/components/camel-paho/pom.xml
index 9066e9e..b3af5f6 100644
--- a/components/camel-paho/pom.xml
+++ b/components/camel-paho/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
index 9a48988..f6e0790 100644
--- a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
+++ b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
@@ -24,10 +24,13 @@ import org.apache.camel.Exchange;
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.eclipse.paho.client.mqttv3.MqttMessage;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class PahoComponentTest extends CamelTestSupport {
@@ -56,7 +59,7 @@ public class PahoComponentTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
broker.stop();
diff --git a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java
index 41e265e..2eeaf29 100644
--- a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java
+++ b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java
@@ -21,9 +21,10 @@ import java.util.Map;
import org.apache.camel.Component;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class PahoComponentVerifierExtensionTest extends CamelTestSupport {
@@ -46,7 +47,7 @@ public class PahoComponentVerifierExtensionTest extends CamelTestSupport {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
@Test
@@ -59,7 +60,7 @@ public class PahoComponentVerifierExtensionTest extends CamelTestSupport {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
}
}
diff --git a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoOverrideTopicTest.java b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoOverrideTopicTest.java
index 609a566..2a26aad 100644
--- a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoOverrideTopicTest.java
+++ b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoOverrideTopicTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.paho;
import org.apache.activemq.broker.BrokerService;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
public class PahoOverrideTopicTest extends CamelTestSupport {
@@ -44,7 +44,7 @@ public class PahoOverrideTopicTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
broker.stop();
[camel] 02/11: [CAMEL-11807] Upgrade camel-nsq 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 b78ef4405eb280970854ed845940be1321f7a320
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 14:43:22 2020 +0200
[CAMEL-11807] Upgrade camel-nsq to junit5
---
components/camel-nsq/pom.xml | 4 ++--
.../src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java | 4 +++-
.../src/test/java/org/apache/camel/component/nsq/NsqProducerTest.java | 4 +++-
.../src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/components/camel-nsq/pom.xml b/components/camel-nsq/pom.xml
index 9f41d0d..bd0ebe0 100644
--- a/components/camel-nsq/pom.xml
+++ b/components/camel-nsq/pom.xml
@@ -46,12 +46,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-testcontainers</artifactId>
+ <artifactId>camel-testcontainers-junit5</artifactId>
<scope>test</scope>
</dependency>
<!-- logging -->
diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java
index 583b274..28bea60 100644
--- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java
+++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java
@@ -25,7 +25,9 @@ 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.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class NsqConsumerTest extends NsqTestSupport {
diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqProducerTest.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqProducerTest.java
index 783bf61..8ea4534 100644
--- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqProducerTest.java
+++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqProducerTest.java
@@ -24,7 +24,9 @@ import com.github.brainlag.nsq.NSQConsumer;
import com.github.brainlag.nsq.lookup.DefaultNSQLookup;
import com.github.brainlag.nsq.lookup.NSQLookup;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class NsqProducerTest extends NsqTestSupport {
diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
index a62747d..3b0ab4c 100644
--- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
+++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
@@ -20,8 +20,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
-import org.apache.camel.test.testcontainers.Wait;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
[camel] 01/11: [CAMEL-11807] Upgrade camel-milo 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 8ec39b8f4feb859e4793be8c2993839a08013f11
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 14:35:48 2020 +0200
[CAMEL-11807] Upgrade camel-milo to junit5
---
components/camel-milo/pom.xml | 6 +++---
.../camel/component/milo/AbstractMiloServerTest.java | 11 ++++++++---
.../milo/MonitorItemMultiConnectionsCertTest.java | 2 +-
.../milo/MonitorItemMultiConnectionsTest.java | 2 +-
.../apache/camel/component/milo/MonitorItemTest.java | 2 +-
.../apache/camel/component/milo/WriteClientTest.java | 2 +-
.../camel/component/milo/call/CallClientTest.java | 13 +++++++------
.../camel/component/milo/client/NodeIdTest.java | 10 +++++++---
.../camel/component/milo/converter/ConverterTest.java | 19 +++++++++++--------
.../camel/component/milo/server/ServerLocalTest.java | 8 ++++----
.../milo/server/ServerSetCertificateManagerTest.java | 2 +-
.../milo/server/ServerSetSecurityPoliciesTest.java | 4 ++--
12 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/components/camel-milo/pom.xml b/components/camel-milo/pom.xml
index f92d347..71fd896 100644
--- a/components/camel-milo/pom.xml
+++ b/components/camel-milo/pom.xml
@@ -65,12 +65,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
index c2c6989..748b46a 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
@@ -24,10 +24,15 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
-import org.junit.Assume;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
public abstract class AbstractMiloServerTest extends CamelTestSupport {
@@ -35,7 +40,7 @@ public abstract class AbstractMiloServerTest extends CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
- Assume.assumeTrue("Requires java 9+", isJavaVersionSatisfied(9));
+ assumeTrue(isJavaVersionSatisfied(9), "Requires java 9+");
super.doPreSetup();
this.serverPort = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
index 4b65dfb..50a6da7 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
@@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
index 116cf98..7e7470e 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing monitoring items over multiple connections
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
index 3b3ba6d..f7ef43a 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing the monitor functionality for item
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
index 9a0942c..7e0c41d 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.milo.NodeIds.nodeValue;
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
index db70850..574bfd3 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
@@ -40,12 +40,13 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
import org.eclipse.milo.opcua.stack.core.types.enumerated.MessageSecurityMode;
import org.eclipse.milo.opcua.stack.core.types.structured.UserTokenPolicy;
import org.eclipse.milo.opcua.stack.server.EndpointConfiguration;
-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.apache.camel.component.milo.NodeIds.nodeValue;
import static org.eclipse.milo.opcua.sdk.server.api.config.OpcUaServerConfig.USER_TOKEN_POLICY_ANONYMOUS;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Unit tests for calling from the client side
@@ -81,7 +82,7 @@ public class CallClientTest extends AbstractMiloServerTest {
return false;
}
- @Before
+ @BeforeEach
public void start() throws Exception {
final OpcUaServerConfigBuilder cfg = OpcUaServerConfig.builder();
@@ -162,8 +163,8 @@ public class CallClientTest extends AbstractMiloServerTest {
doCall(this.producer1, "bar");
// assert
- Assert.assertNotNull(this.callMethod);
- Assert.assertArrayEquals(new Object[] {"out-foo", "out-bar"}, this.callMethod.getCalls().toArray());
+ assertNotNull(this.callMethod);
+ assertArrayEquals(new Object[] {"out-foo", "out-bar"}, this.callMethod.getCalls().toArray());
}
private static void doCall(final ProducerTemplate producerTemplate, final Object input) {
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
index 2fe15a8..aeeb55b 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
@@ -21,12 +21,15 @@ import java.io.Serializable;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.component.milo.AbstractMiloServerTest;
import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.google.common.net.UrlEscapers.urlFormParameterEscaper;
import static org.apache.camel.component.milo.server.MiloServerComponent.DEFAULT_NAMESPACE_URI;
import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint;
import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ushort;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Testing different ways to specify node IDs
@@ -62,10 +65,11 @@ public class NodeIdTest extends AbstractMiloServerTest {
testUri("milo-client://user:password@localhost:12345?node=RAW(nsu=http://foo.bar;s=foo/bar)", "http://foo.bar", "foo/bar");
}
- @Test(expected = ResolveEndpointFailedException.class)
+ @Test
public void testMixed() {
// This must fail since "node" is incomplete
- testUri("milo-client:tcp://foo:bar@localhost:@@port@@?node=foo&namespaceUri=" + DEFAULT_NAMESPACE_URI, null, null);
+ assertThrows(ResolveEndpointFailedException.class,
+ () -> testUri("milo-client:tcp://foo:bar@localhost:@@port@@?node=foo&namespaceUri=" + DEFAULT_NAMESPACE_URI, null, null));
}
private void testUri(final String uri, final Serializable namespace, final Serializable partialNodeId) {
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
index 7c692c9..03cdbf2 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
@@ -16,27 +16,30 @@
*/
package org.apache.camel.component.milo.converter;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
-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 ConverterTest extends CamelTestSupport {
@Test
public void testDataValueToVariant() {
final Variant value = testConvertDataValue("Foo", Variant.class);
- Assert.assertNotNull(value);
- Assert.assertEquals("Foo", value.getValue());
+ assertNotNull(value);
+ assertEquals("Foo", value.getValue());
}
@Test
public void testVariantToDataValue() {
final DataValue value = testConvert(new Variant("Foo"), DataValue.class);
- Assert.assertNotNull(value);
- Assert.assertEquals("Foo", value.getValue().getValue());
- Assert.assertTrue(value.getStatusCode().isGood());
+ assertNotNull(value);
+ assertEquals("Foo", value.getValue().getValue());
+ assertTrue(value.getStatusCode().isGood());
}
private <T> T testConvert(final Object value, final Class<T> clazz) {
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
index 7fce094..42738d3 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
@@ -23,11 +23,11 @@ import org.apache.camel.RoutesBuilder;
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.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for milo server component without using an actual connection
@@ -41,7 +41,7 @@ public class ServerLocalTest extends CamelTestSupport {
@EndpointInject(MOCK_TEST)
protected MockEndpoint testEndpoint;
- @Before
+ @BeforeEach
public void pickFreePort() throws IOException {
final MiloServerComponent component = context().getComponent("milo-server", MiloServerComponent.class);
component.setPort(AvailablePortFinder.getNextAvailable());
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
index cea606d..7a31039 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
@@ -21,7 +21,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.camel.component.milo.AbstractMiloServerTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
index d73f3fa..ccb550d 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.milo.server;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Test setting security policies
[camel] 03/11: [CAMEL-11807] Upgrade camel-ognl 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 da45945d67a3b2a92b641be9337d21c964c1fc41
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 14:46:40 2020 +0200
[CAMEL-11807] Upgrade camel-ognl to junit5
---
components/camel-ognl/pom.xml | 6 +++---
.../org/apache/camel/language/ognl/OgnlInvokeMethodTest.java | 4 ++--
.../java/org/apache/camel/language/ognl/OgnlResourceTest.java | 4 ++--
.../src/test/java/org/apache/camel/language/ognl/OgnlTest.java | 10 +++++++---
.../org/apache/camel/language/ognl/patterns/FilterTest.java | 4 ++--
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml
index 05effe7..0786f5c 100644
--- a/components/camel-ognl/pom.xml
+++ b/components/camel-ognl/pom.xml
@@ -47,7 +47,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -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>
</dependencies>
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java
index 9fc2b4f..c81f1db 100644
--- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.language.ognl;
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;
/**
*
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java
index f079d06..473f92c 100644
--- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlResourceTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.language.ognl;
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;
/**
*
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
index 6239f8e..072f52a 100644
--- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java
@@ -16,8 +16,12 @@
*/
package org.apache.camel.language.ognl;
-import org.apache.camel.test.junit4.LanguageTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.LanguageTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class OgnlTest extends LanguageTestSupport {
@@ -38,7 +42,7 @@ public class OgnlTest extends LanguageTestSupport {
assertExpression("@org.apache.camel.language.ognl.Animal1@getClassName()", "Animal");
fail("Expect exception here.");
} catch (Exception ex) {
- assertTrue("We should get the ClassNotFoundException", ex.getMessage().indexOf("ClassNotFoundException") > 0);
+ assertTrue(ex.getMessage().contains("ClassNotFoundException"), "We should get the ClassNotFoundException");
}
// setup the class resolver to load the right class for us
exchange.getContext().setClassResolver(new MyClassResolver(context));
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java
index 349614d..fe968f5 100644
--- a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.language.ognl.patterns;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class FilterTest extends CamelTestSupport {
[camel] 08/11: [CAMEL-11807] Upgrade camel-pg-replication-slot 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 6144fb18d6caed2ae303b500bf6ca468c482a703
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 16:05:21 2020 +0200
[CAMEL-11807] Upgrade camel-pg-replication-slot to junit5
---
components/camel-pg-replication-slot/pom.xml | 4 ++--
.../slot/PgReplicationSlotEndpointTest.java | 22 ++++++++--------------
.../PgReplicationSlotIntegrationTest.java | 12 ++++++------
3 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/components/camel-pg-replication-slot/pom.xml b/components/camel-pg-replication-slot/pom.xml
index b6cac3c..66da9db 100644
--- a/components/camel-pg-replication-slot/pom.xml
+++ b/components/camel-pg-replication-slot/pom.xml
@@ -49,12 +49,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-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-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointTest.java b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointTest.java
index aa078bf..7e9a06b 100644
--- a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointTest.java
+++ b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointTest.java
@@ -16,21 +16,17 @@
*/
package org.apache.camel.component.pg.replication.slot;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class PgReplicationSlotEndpointTest {
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
@Test
public void testUriParsing() {
PgReplicationSlotEndpoint endpoint = null;
@@ -71,10 +67,8 @@ public class PgReplicationSlotEndpointTest {
@Test
public void testParsingBadUri() {
- this.expectedException.expect(IllegalArgumentException.class);
-
PgReplicationSlotComponent component = mock(PgReplicationSlotComponent.class);
-
- new PgReplicationSlotEndpoint("pg-replication-slot:/database/slot", component);
+ assertThrows(IllegalArgumentException.class,
+ () -> new PgReplicationSlotEndpoint("pg-replication-slot:/database/slot", component));
}
}
diff --git a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationSlotIntegrationTest.java b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationSlotIntegrationTest.java
index 701c9b9..c709442 100644
--- a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationSlotIntegrationTest.java
+++ b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationSlotIntegrationTest.java
@@ -29,10 +29,10 @@ import org.apache.camel.PropertyInject;
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.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class PgReplicationSlotIntegrationTest extends CamelTestSupport {
@@ -61,7 +61,7 @@ public class PgReplicationSlotIntegrationTest extends CamelTestSupport {
private Connection connection;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -77,7 +77,7 @@ public class PgReplicationSlotIntegrationTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
[camel] 11/11: [CAMEL-11807] Upgrade camel-opentracing 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 db8f2d9f0d3a65e8f7865d53815ba42d7954b159
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Sat Jul 18 13:37:08 2020 +0200
[CAMEL-11807] Upgrade camel-opentracing to junit5
---
.../test/java/org/apache/camel/opentracing/SpanProcessorsTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpanProcessorsTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpanProcessorsTest.java
index 1d588fb..ae4952f 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpanProcessorsTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpanProcessorsTest.java
@@ -20,9 +20,10 @@ import io.opentracing.tag.Tags;
import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.language.simple.SimpleLanguage.simple;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SpanProcessorsTest extends CamelOpenTracingTestSupport {
@@ -60,7 +61,7 @@ public class SpanProcessorsTest extends CamelOpenTracingTestSupport {
});
verify();
- assertEquals("request-header-value", result.getMessage().getHeader("baggage-header", String.class));
+ assertEquals(result.getMessage().getHeader("baggage-header", String.class), "request-header-value");
}
@Override
[camel] 06/11: [CAMEL-11807] Upgrade camel-pdf 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 fb07bc0041693a7a902cc81f4b2be81cd46bcec9
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 15:51:44 2020 +0200
[CAMEL-11807] Upgrade camel-pdf to junit5
---
components/camel-pdf/pom.xml | 6 +++---
.../org/apache/camel/component/pdf/PdfAppendTest.java | 10 ++++++----
.../org/apache/camel/component/pdf/PdfCreationTest.java | 16 ++++++++++------
.../camel/component/pdf/PdfTextExtractionTest.java | 5 +++--
.../component/pdf/text/PatternSplitStrategyTest.java | 4 ++--
.../camel/component/pdf/text/WordSplitStrategyTest.java | 4 ++--
6 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index 8e23736..ff636e7 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -70,12 +70,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>
<exclusions>
<exclusion>
diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java
index 16a1072..a0d8dfa 100644
--- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java
+++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java
@@ -27,7 +27,7 @@ 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.apache.camel.test.junit5.CamelTestSupport;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -37,11 +37,13 @@ import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import org.apache.pdfbox.text.PDFTextStripper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class PdfAppendTest extends CamelTestSupport {
@@ -49,7 +51,7 @@ public class PdfAppendTest extends CamelTestSupport {
protected MockEndpoint resultEndpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
}
diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
index 9bb9005..e01ff15 100644
--- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
+++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
@@ -25,16 +25,20 @@ 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.apache.camel.test.junit5.CamelTestSupport;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
import org.apache.pdfbox.text.PDFTextStripper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
+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 PdfCreationTest extends CamelTestSupport {
@@ -42,7 +46,7 @@ public class PdfCreationTest extends CamelTestSupport {
protected MockEndpoint resultEndpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
}
@@ -94,8 +98,8 @@ public class PdfCreationTest extends CamelTestSupport {
assertThat(body, instanceOf(ByteArrayOutputStream.class));
try {
PDDocument doc = PDDocument.load(new ByteArrayInputStream(((ByteArrayOutputStream) body).toByteArray()), userPass);
- assertTrue("Expected encrypted document", doc.isEncrypted());
- assertFalse("Printing should not be permitted", doc.getCurrentAccessPermission().canPrint());
+ assertTrue(doc.isEncrypted(), "Expected encrypted document");
+ assertFalse(doc.getCurrentAccessPermission().canPrint(), "Printing should not be permitted");
PDFTextStripper pdfTextStripper = new PDFTextStripper();
String text = pdfTextStripper.getText(doc);
assertEquals(1, doc.getNumberOfPages());
diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java
index f994d7d..7996277 100644
--- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java
+++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java
@@ -24,7 +24,7 @@ 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.apache.camel.test.junit5.CamelTestSupport;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -33,8 +33,9 @@ import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.junit.Test;
+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-pdf/src/test/java/org/apache/camel/component/pdf/text/PatternSplitStrategyTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/PatternSplitStrategyTest.java
index 18f1d14..449a66a 100644
--- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/PatternSplitStrategyTest.java
+++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/PatternSplitStrategyTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.pdf.text;
import java.util.ArrayList;
import java.util.Collection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class PatternSplitStrategyTest {
private static final String PATTERN = "\n";
diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/WordSplitStrategyTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/WordSplitStrategyTest.java
index 8b9cddc..92a2a20 100644
--- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/WordSplitStrategyTest.java
+++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/WordSplitStrategyTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.pdf.text;
import java.util.ArrayList;
import java.util.Collection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class WordSplitStrategyTest {
[camel] 09/11: [CAMEL-11807] Upgrade camel-protobuf 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 b5a631da85cd326e93444e91420c3340c1a8a3dd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 17:11:42 2020 +0200
[CAMEL-11807] Upgrade camel-protobuf to junit5
---
components/camel-protobuf/pom.xml | 6 +++---
.../camel/dataformat/protobuf/ProtobufConverterTest.java | 16 ++++++++++------
.../protobuf/ProtobufMarshalAndUnmarshalJsonTest.java | 6 ++++--
.../protobuf/ProtobufMarshalAndUnmarshalMapTest.java | 6 ++++--
.../protobuf/ProtobufMarshalAndUnmarshalSpringTest.java | 10 +++++++---
.../protobuf/ProtobufMarshalAndUnmarshalTest.java | 10 +++++++---
6 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index 7d3970d..453feaf 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -58,12 +58,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-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufConverterTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufConverterTest.java
index 1af84df..a2fecdf 100644
--- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufConverterTest.java
+++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufConverterTest.java
@@ -21,9 +21,11 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class ProtobufConverterTest {
@@ -73,7 +75,7 @@ public class ProtobufConverterTest {
assertEquals("awesome2", message.getNicknames(1));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testIfThrowsErrorInCaseNestedMessageNotMap() {
final Map<String, Object> input = new HashMap<>();
@@ -81,10 +83,11 @@ public class ProtobufConverterTest {
input.put("id", 1234);
input.put("address", "wrong address");
- final AddressBookProtos.Person message = (AddressBookProtos.Person) ProtobufConverter.toProto(input, AddressBookProtos.Person.getDefaultInstance());
+ assertThrows(IllegalArgumentException.class,
+ () -> ProtobufConverter.toProto(input, AddressBookProtos.Person.getDefaultInstance()));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testIfThrowsErrorInCaseRepeatedFieldIsNotList() {
final Map<String, Object> input = new HashMap<>();
@@ -92,7 +95,8 @@ public class ProtobufConverterTest {
input.put("id", 1234);
input.put("nicknames", "wrong nickname");
- final AddressBookProtos.Person message = (AddressBookProtos.Person) ProtobufConverter.toProto(input, AddressBookProtos.Person.getDefaultInstance());
+ assertThrows(IllegalArgumentException.class,
+ () -> ProtobufConverter.toProto(input, AddressBookProtos.Person.getDefaultInstance()));
}
@Test
diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java
index 5268918..189c960 100644
--- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java
+++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.dataformat.protobuf;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person;
-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 ProtobufMarshalAndUnmarshalJsonTest extends CamelTestSupport {
diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalMapTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalMapTest.java
index 201a5d6..efc9c1d 100644
--- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalMapTest.java
+++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalMapTest.java
@@ -23,8 +23,10 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person;
-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 ProtobufMarshalAndUnmarshalMapTest extends CamelTestSupport {
diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalSpringTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalSpringTest.java
index 5f45287..6ae14b4 100644
--- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalSpringTest.java
+++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalSpringTest.java
@@ -22,10 +22,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos;
import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person;
-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 ProtobufMarshalAndUnmarshalSpringTest extends CamelSpringTestSupport {
@Override
@@ -59,7 +63,7 @@ public class ProtobufMarshalAndUnmarshalSpringTest extends CamelSpringTestSuppor
});
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-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalTest.java
index ab25148..5d6a347 100644
--- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalTest.java
+++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalTest.java
@@ -22,8 +22,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos;
import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person;
-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 ProtobufMarshalAndUnmarshalTest extends CamelTestSupport {
@@ -53,7 +57,7 @@ public class ProtobufMarshalAndUnmarshalTest extends CamelTestSupport {
});
fail("Expect the exception here");
} catch (Exception ex) {
- assertTrue("Expect FailedToCreateRouteException", ex instanceof FailedToCreateRouteException);
+ assertTrue(ex instanceof FailedToCreateRouteException, "Expect FailedToCreateRouteException");
}
}
[camel] 10/11: [CAMEL-11807] Upgrade camel-pubnub 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 e269218b57b765970a0fa318e814f53eaaa0b76e
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 17 17:30:39 2020 +0200
[CAMEL-11807] Upgrade camel-pubnub to junit5
---
components/camel-pubnub/pom.xml | 8 +++++--
.../component/pubnub/PubNubConfigurationTest.java | 14 ++++++++----
.../camel/component/pubnub/PubNubFireTest.java | 2 +-
.../component/pubnub/PubNubOperationsTest.java | 5 ++++-
.../camel/component/pubnub/PubNubPresenceTest.java | 3 ++-
.../camel/component/pubnub/PubNubPublishTest.java | 8 ++++---
.../component/pubnub/PubNubSubscriberTest.java | 2 +-
.../camel/component/pubnub/PubNubTestBase.java | 25 +++++++++-------------
.../pubnub/example/PubNubStateExample.java | 10 +++++----
9 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index f8c3fe2..b72544a 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -77,7 +77,12 @@
<!-- testing -->
<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>
@@ -86,6 +91,5 @@
<version>${wiremock-version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
</project>
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java
index 06fe4f5..8bb8608 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubConfigurationTest.java
@@ -16,15 +16,21 @@
*/
package org.apache.camel.component.pubnub;
-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 PubNubConfigurationTest extends CamelTestSupport {
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithIllegalArguments() throws Exception {
PubNubComponent component = new PubNubComponent(context);
- component.createEndpoint("pubnub");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("pubnub"));
}
@Test
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java
index aeb6cab..d3709a3 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.pubnub;
import org.apache.camel.EndpointInject;
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 com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
index c2303e4..ed6feb3 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
@@ -26,12 +26,15 @@ import com.pubnub.api.models.consumer.presence.PNGetStateResult;
import com.pubnub.api.models.consumer.presence.PNHereNowResult;
import com.pubnub.api.models.consumer.presence.PNSetStateResult;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static org.apache.camel.test.junit5.TestSupport.assertListSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class PubNubOperationsTest extends PubNubTestBase {
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java
index ff6a579..3f90243 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java
@@ -20,13 +20,14 @@ import com.pubnub.api.models.consumer.pubsub.PNPresenceEventResult;
import org.apache.camel.EndpointInject;
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 com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
public class PubNubPresenceTest extends PubNubTestBase {
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java
index 5d16314..0c2c1f7 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.EndpointInject;
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 com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -28,6 +28,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
import static org.apache.camel.component.pubnub.PubNubConstants.TIMETOKEN;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class PubNubPublishTest extends PubNubTestBase {
private String endpoint = "pubnub:someChannel?pubnub=#pubnub";
@@ -44,9 +45,10 @@ public class PubNubPublishTest extends PubNubTestBase {
assertMockEndpointsSatisfied();
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testPublishEmptyBody() throws Exception {
- template.sendBody("direct:publish", null);
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:publish", null));
}
@Test
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java
index 22135ab..cc08ea6 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.pubnub;
import org.apache.camel.EndpointInject;
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 com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
index feca647..6aae396 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
@@ -16,39 +16,34 @@
*/
package org.apache.camel.component.pubnub;
-import java.io.IOException;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
import com.pubnub.api.PNConfiguration;
import com.pubnub.api.PubNub;
import com.pubnub.api.enums.PNLogVerbosity;
import org.apache.camel.BindToRegistry;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
+import org.apache.camel.test.junit5.CamelTestSupport;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
import static com.pubnub.api.enums.PNHeartbeatNotificationOptions.NONE;
public class PubNubTestBase extends CamelTestSupport {
+
private final int port = AvailablePortFinder.getNextAvailable();
@BindToRegistry("pubnub")
private PubNub pubnub = createPubNubInstance();
- @Rule
- public WireMockRule wireMockRule = new WireMockRule(options().port(port));
-
+ private WireMockServer wireMockServer = new WireMockServer(options().port(port));
- @Before
- public void beforeEach() throws IOException {
- wireMockRule.start();
+ protected void setupResources() throws Exception {
+ wireMockServer.start();
+ WireMock.configureFor("localhost", wireMockServer.port());
}
- @After
- public void afterEach() {
+ protected void cleanupResources() throws Exception {
+ wireMockServer.stop();
pubnub.destroy();
}
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
index 071af53..be392b2 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubStateExample.java
@@ -24,14 +24,16 @@ import com.pubnub.api.models.consumer.presence.PNSetStateResult;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.pubnub.PubNubConstants;
-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 static org.apache.camel.component.pubnub.example.PubNubExampleConstants.PUBNUB_PUBLISH_KEY;
import static org.apache.camel.component.pubnub.example.PubNubExampleConstants.PUBNUB_SUBSCRIBE_KEY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-@Ignore("Integration test that requires a pub/sub key to run")
+@Disabled("Integration test that requires a pub/sub key to run")
public class PubNubStateExample extends CamelTestSupport {
@Test