This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit d3fba2f3401e53512e7ff9df05b3a10443ba4b55 Author: Guillaume Nodet <[email protected]> AuthorDate: Fri Jul 24 12:31:53 2020 +0200 [CAMEL-11807] Upgrade camel-vertx to junit5 --- components/camel-vertx/pom.xml | 2 +- .../org/apache/camel/component/vertx/VertxBaseTestSupport.java | 10 +++++++--- .../camel/component/vertx/VertxMultipleConsumerTest.java | 2 +- .../apache/camel/component/vertx/VertxRequestReplyTest.java | 4 +++- .../org/apache/camel/component/vertx/VertxRoutePubSubTest.java | 2 +- .../java/org/apache/camel/component/vertx/VertxRouteTest.java | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml index f840107..0ebbcdd 100644 --- a/components/camel-vertx/pom.xml +++ b/components/camel-vertx/pom.xml @@ -55,7 +55,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java index 0399584..571232d 100644 --- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java +++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java @@ -17,14 +17,18 @@ package org.apache.camel.component.vertx; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.BeforeClass; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeAll; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class VertxBaseTestSupport extends CamelTestSupport { protected static int port; - @BeforeClass + protected final Logger log = LoggerFactory.getLogger(getClass()); + + @BeforeAll public static void initPort() throws Exception { port = AvailablePortFinder.getNextAvailable(); } diff --git a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxMultipleConsumerTest.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxMultipleConsumerTest.java index aca7b45..c044b22 100644 --- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxMultipleConsumerTest.java +++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxMultipleConsumerTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.vertx; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class VertxMultipleConsumerTest extends VertxBaseTestSupport { diff --git a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRequestReplyTest.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRequestReplyTest.java index aaa0c1f..959afed 100644 --- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRequestReplyTest.java +++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRequestReplyTest.java @@ -18,7 +18,9 @@ package org.apache.camel.component.vertx; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class VertxRequestReplyTest extends VertxBaseTestSupport { diff --git a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java index 31e5db9..b075670 100644 --- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java +++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class VertxRoutePubSubTest extends VertxBaseTestSupport { diff --git a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java index 17005ac..247e6dc 100644 --- a/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java +++ b/components/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class VertxRouteTest extends VertxBaseTestSupport {
