This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit eedcf3b0d1255f7de38a3fc7c691d540294d1d41 Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 27 12:23:11 2020 +0200 [CAMEL-11807] Upgrade camel-zipkin to junit5 --- components/camel-zipkin/pom.xml | 7 ++++++- .../test/java/org/apache/camel/zipkin/CamelRequestTest.java | 2 +- .../org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java | 11 ++++++++--- .../org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java | 6 ++++-- .../test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java | 6 ++++-- .../org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java | 4 ++-- .../camel/zipkin/ZipkinClientRecipientListRouteTest.java | 6 ++++-- .../org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java | 6 ++++-- .../apache/camel/zipkin/ZipkinMultiServerNoClientTest.java | 4 ++-- .../org/apache/camel/zipkin/ZipkinMulticastRouteTest.java | 6 ++++-- .../org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java | 4 ++-- .../test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java | 4 ++-- .../org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java | 4 ++-- .../org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java | 6 ++++-- .../org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java | 6 ++++-- .../org/apache/camel/zipkin/ZipkinServerMulticastTest.java | 4 ++-- .../apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java | 6 ++++-- .../apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java | 6 ++++-- .../java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java | 6 ++++-- .../apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java | 7 +++++-- .../java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java | 6 ++++-- .../test/java/org/apache/camel/zipkin/ZipkinTracerTest.java | 4 ++-- .../test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java | 4 ++-- .../org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java | 4 ++-- .../apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java | 4 ++-- 25 files changed, 84 insertions(+), 49 deletions(-) diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml index 6c202ba..ac3bf30e 100644 --- a/components/camel-zipkin/pom.xml +++ b/components/camel-zipkin/pom.xml @@ -75,7 +75,7 @@ <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -93,6 +93,11 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/CamelRequestTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/CamelRequestTest.java index 75cccff..06464ee 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/CamelRequestTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/CamelRequestTest.java @@ -18,7 +18,7 @@ package org.apache.camel.zipkin; import brave.Span; import org.apache.camel.Message; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java index 5d69c9f..c1db957 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ManagedZipkinSimpleRouteTest.java @@ -25,10 +25,15 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.apache.camel.test.junit5.TestSupport.isPlatform; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ManagedZipkinSimpleRouteTest extends CamelTestSupport { private ZipkinTracer zipkin; @@ -73,7 +78,7 @@ public class ManagedZipkinSimpleRouteTest extends CamelTestSupport { assertTrue(mbeanServer.isRegistered(on)); Float rate = (Float) mbeanServer.getAttribute(on, "Rate"); - assertEquals("Should be 1.0f", 1.0f, rate.floatValue(), 0.1f); + assertEquals(1.0f, rate.floatValue(), 0.1f, "Should be 1.0f"); NotifyBuilder notify = new NotifyBuilder(context).whenDone(5).create(); diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java index 506b28c..182d16e 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/SpringZipkinSimpleRouteTest.java @@ -19,11 +19,13 @@ package org.apache.camel.zipkin; import java.util.concurrent.TimeUnit; import org.apache.camel.builder.NotifyBuilder; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class SpringZipkinSimpleRouteTest extends CamelSpringTestSupport { @Override diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java index 956e54c..15109ca 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinABCRouteTest.java @@ -22,10 +22,12 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinABCRouteTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java index 793c22e..fa4a690 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java @@ -24,8 +24,8 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; public class ZipkinClientCustomTagsTest extends CamelTestSupport { diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientRecipientListRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientRecipientListRouteTest.java index c0d2437..bb2eb2d 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientRecipientListRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientRecipientListRouteTest.java @@ -22,10 +22,12 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinClientRecipientListRouteTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java index 5102b41..6a71f90 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java @@ -21,11 +21,13 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.MDC; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class ZipkinMDCScopeDecoratorTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMultiServerNoClientTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMultiServerNoClientTest.java index 5696d0a..9158750 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMultiServerNoClientTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMultiServerNoClientTest.java @@ -19,8 +19,8 @@ package org.apache.camel.zipkin; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; public class ZipkinMultiServerNoClientTest extends CamelTestSupport { diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMulticastRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMulticastRouteTest.java index 391b3ad..0f092a8 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMulticastRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMulticastRouteTest.java @@ -22,10 +22,12 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinMulticastRouteTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java index 3299821..90755be 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteFallbackTest.java @@ -19,8 +19,8 @@ package org.apache.camel.zipkin; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; public class ZipkinOneRouteFallbackTest extends CamelTestSupport { diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java index ae0149c..36aabe4 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinOneRouteTest.java @@ -19,8 +19,8 @@ package org.apache.camel.zipkin; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; public class ZipkinOneRouteTest extends CamelTestSupport { diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java index 2b7cc78..b4e28c4 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinProducerSpanKindTest.java @@ -23,9 +23,9 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; public class ZipkinProducerSpanKindTest extends CamelTestSupport { diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java index b342e89..2ed190c 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRecipientListRouteTest.java @@ -22,10 +22,12 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinRecipientListRouteTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java index 149c401..aab6d3d 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinRouteConcurrentTest.java @@ -22,10 +22,12 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinRouteConcurrentTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinServerMulticastTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinServerMulticastTest.java index 9a32b74..5fd73ce 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinServerMulticastTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinServerMulticastTest.java @@ -19,8 +19,8 @@ package org.apache.camel.zipkin; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; public class ZipkinServerMulticastTest extends CamelTestSupport { diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java index 3945155..45ef7b7 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleFallbackRouteTest.java @@ -22,10 +22,12 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinSimpleFallbackRouteTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java index 903606b..5b1689b 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleLogStreamsRouteTest.java @@ -22,10 +22,12 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinSimpleLogStreamsRouteTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java index 83eb155..c241f2d 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSimpleRouteTest.java @@ -22,10 +22,12 @@ import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinSimpleRouteTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java index f1c0d0b..2a55812 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java @@ -19,10 +19,13 @@ package org.apache.camel.zipkin; import org.apache.camel.CamelContext; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinSpanReporterInRegistryTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java index c152fcd..d92a37e 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTimerRouteTest.java @@ -23,10 +23,12 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ZipkinTimerRouteTest extends CamelTestSupport { private ZipkinTracer zipkin; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTracerTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTracerTest.java index 55f9a34..014a946 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTracerTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTracerTest.java @@ -19,9 +19,9 @@ package org.apache.camel.zipkin; import brave.Span; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; import static org.mockito.Mockito.mock; diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java index d724a30..74eae4d 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinTwoRouteTest.java @@ -19,8 +19,8 @@ package org.apache.camel.zipkin; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import zipkin2.reporter.Reporter; public class ZipkinTwoRouteTest extends CamelTestSupport { diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java index f6b037c..c9465c7 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/http/ZipkinAutoConfigureHttp.java @@ -19,9 +19,9 @@ package org.apache.camel.zipkin.http; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.zipkin.ZipkinTracer; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Integration test requires running Zipkin running diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java index b38c7e2..ae37cdb 100644 --- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java +++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java @@ -19,9 +19,9 @@ package org.apache.camel.zipkin.scribe; import org.apache.camel.CamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.zipkin.ZipkinTracer; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Integration test requires running Zipkin/Scribe running
