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 <gno...@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
