You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/10/25 15:29:49 UTC

[camel] branch CAMEL-13965 updated (3f71e20 -> ae2dff6)

This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a change to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git.


 discard 3f71e20  CAMEL-14084: Initial import of camel-testcontainers-spring-junit5 from camel-testcontainers-spring
     add 1bcd5b2  CAMEL-14084: Created the camel-testcontainers-spring-junit5 module from camel-testcontainers-spring
     add c71604b  Camel-Pulsar: Use just Pulsar as title
     add 60d49c2  Camel-Pulsar: Regen
     add 1dc28db  Camel-Spark: Use only Spark in the Title
     add 6482760  Camel-Spark: Regen
     new fbeb9ca  CAMEL-14084: Migrated camel-consul tests to camel-testcontainers-spring-junit5
     new ae2dff6  CAMEL-14084: Migrated remaining camel-consul tests to JUnit 5

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (3f71e20)
            \
             N -- N -- N   refs/heads/CAMEL-13965 (ae2dff6)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 2 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-consul/pom.xml                    | 13 ++++++-----
 .../SpringConsulDefaultServiceCallRouteTest.java   | 12 +++++------
 ...SpringConsulExpressionServiceCallRouteTest.java | 12 +++++------
 .../SpringConsulRibbonServiceCallRouteTest.java    | 12 +++++------
 .../cloud/SpringConsulServiceCallRouteTest.java    |  8 +++----
 .../ConsulClusteredRoutePolicyFactoryMain.java     |  2 +-
 .../ConsulClusteredRoutePolicyFactoryTest.java     | 14 ++++++------
 .../cluster/ConsulClusteredRoutePolicyTest.java    | 14 ++++++------
 .../component/consul/cluster/ConsulMasterTest.java | 14 ++++++------
 .../src/main/docs/pulsar-component.adoc            | 11 ++++++----
 .../camel/component/pulsar/PulsarEndpoint.java     |  2 +-
 .../camel-spark/src/main/docs/spark-component.adoc | 10 ++++-----
 .../camel/component/spark/SparkEndpoint.java       |  2 +-
 .../main/docs/testcontainers-spring-junit5.adoc    | 25 +++++++++++++++++++---
 .../endpoint/dsl/PulsarEndpointBuilderFactory.java | 14 ++++++------
 docs/components/modules/ROOT/nav.adoc              |  4 ++--
 docs/components/modules/ROOT/pages/index.adoc      | 12 ++++++-----
 .../modules/ROOT/pages/pulsar-component.adoc       | 11 ++++++----
 .../modules/ROOT/pages/spark-component.adoc        | 10 ++++-----
 .../ROOT/pages/testcontainers-spring-junit5.adoc   | 25 +++++++++++++++++++---
 parent/pom.xml                                     |  5 +++++
 21 files changed, 144 insertions(+), 88 deletions(-)


[camel] 01/02: CAMEL-14084: Migrated camel-consul tests to camel-testcontainers-spring-junit5

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fbeb9ca5051cdd6fe8b0c9c2983e44f6f8654d65
Author: aldettinger <al...@gmail.com>
AuthorDate: Fri Oct 25 14:00:19 2019 +0200

    CAMEL-14084: Migrated camel-consul tests to camel-testcontainers-spring-junit5
---
 components/camel-consul/pom.xml                    |  2 +-
 .../SpringConsulDefaultServiceCallRouteTest.java   | 12 +++++------
 ...SpringConsulExpressionServiceCallRouteTest.java | 12 +++++------
 .../SpringConsulRibbonServiceCallRouteTest.java    | 12 +++++------
 .../cloud/SpringConsulServiceCallRouteTest.java    |  8 +++----
 .../main/docs/testcontainers-spring-junit5.adoc    | 25 +++++++++++++++++++---
 docs/components/modules/ROOT/pages/index.adoc      |  4 +++-
 .../ROOT/pages/testcontainers-spring-junit5.adoc   | 25 +++++++++++++++++++---
 8 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 65eef4f..282cfed 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -50,7 +50,7 @@
         <!-- testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-testcontainers-spring</artifactId>
+            <artifactId>camel-testcontainers-spring-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulDefaultServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulDefaultServiceCallRouteTest.java
index a5bfb2d..3fb9c09 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulDefaultServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulDefaultServiceCallRouteTest.java
@@ -20,8 +20,8 @@ import java.util.List;
 
 import org.apache.camel.component.ribbon.cloud.RibbonServiceLoadBalancer;
 import org.apache.camel.impl.cloud.DefaultServiceCallProcessor;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -35,9 +35,9 @@ public class SpringConsulDefaultServiceCallRouteTest extends SpringConsulService
     public void testServiceCallConfiguration() {
         List<DefaultServiceCallProcessor> processors = findServiceCallProcessors();
 
-        Assert.assertFalse(processors.isEmpty());
-        Assert.assertEquals(2, processors.size());
-        Assert.assertFalse(processors.get(0).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
-        Assert.assertFalse(processors.get(1).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
+        Assertions.assertFalse(processors.isEmpty());
+        Assertions.assertEquals(2, processors.size());
+        Assertions.assertFalse(processors.get(0).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
+        Assertions.assertFalse(processors.get(1).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
     }
 }
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulExpressionServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulExpressionServiceCallRouteTest.java
index 79f5e98..d913c76 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulExpressionServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulExpressionServiceCallRouteTest.java
@@ -20,8 +20,8 @@ import java.util.List;
 
 import org.apache.camel.component.ribbon.cloud.RibbonServiceLoadBalancer;
 import org.apache.camel.impl.cloud.DefaultServiceCallProcessor;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -35,9 +35,9 @@ public class SpringConsulExpressionServiceCallRouteTest extends SpringConsulServ
     public void testServiceCallConfiguration() {
         List<DefaultServiceCallProcessor> processors = findServiceCallProcessors();
 
-        Assert.assertFalse(processors.isEmpty());
-        Assert.assertEquals(2, processors.size());
-        Assert.assertFalse(processors.get(0).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
-        Assert.assertFalse(processors.get(1).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
+        Assertions.assertFalse(processors.isEmpty());
+        Assertions.assertEquals(2, processors.size());
+        Assertions.assertFalse(processors.get(0).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
+        Assertions.assertFalse(processors.get(1).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
     }
 }
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulRibbonServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulRibbonServiceCallRouteTest.java
index e3fbb6f..0941097 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulRibbonServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulRibbonServiceCallRouteTest.java
@@ -20,8 +20,8 @@ import java.util.List;
 
 import org.apache.camel.component.ribbon.cloud.RibbonServiceLoadBalancer;
 import org.apache.camel.impl.cloud.DefaultServiceCallProcessor;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -35,9 +35,9 @@ public class SpringConsulRibbonServiceCallRouteTest extends SpringConsulServiceC
     public void testServiceCallConfiguration() {
         List<DefaultServiceCallProcessor> processors = findServiceCallProcessors();
 
-        Assert.assertFalse(processors.isEmpty());
-        Assert.assertEquals(2, processors.size());
-        Assert.assertTrue(processors.get(0).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
-        Assert.assertTrue(processors.get(1).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
+        Assertions.assertFalse(processors.isEmpty());
+        Assertions.assertEquals(2, processors.size());
+        Assertions.assertTrue(processors.get(0).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
+        Assertions.assertTrue(processors.get(1).getLoadBalancer() instanceof RibbonServiceLoadBalancer);
     }
 }
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java
index 68de60c..6732c02 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/SpringConsulServiceCallRouteTest.java
@@ -31,9 +31,9 @@ import org.apache.camel.component.consul.ConsulTestSupport;
 import org.apache.camel.impl.cloud.DefaultServiceCallProcessor;
 import org.apache.camel.processor.ChoiceProcessor;
 import org.apache.camel.processor.FilterProcessor;
-import org.apache.camel.test.testcontainers.spring.ContainerAwareSpringTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.testcontainers.spring.junit5.ContainerAwareSpringTestSupport;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 
 public abstract class SpringConsulServiceCallRouteTest extends ContainerAwareSpringTestSupport {
@@ -130,7 +130,7 @@ public abstract class SpringConsulServiceCallRouteTest extends ContainerAwareSpr
     protected List<DefaultServiceCallProcessor> findServiceCallProcessors() {
         Route route = context().getRoute("scall");
 
-        Assert.assertNotNull("ServiceCall Route should be present", route);
+        Assertions.assertNotNull(route, "ServiceCall Route should be present");
 
         return findServiceCallProcessors(new ArrayList<>(), route.navigate());
     }
diff --git a/components/camel-testcontainers-spring-junit5/src/main/docs/testcontainers-spring-junit5.adoc b/components/camel-testcontainers-spring-junit5/src/main/docs/testcontainers-spring-junit5.adoc
index 96b3347..7338f04 100644
--- a/components/camel-testcontainers-spring-junit5/src/main/docs/testcontainers-spring-junit5.adoc
+++ b/components/camel-testcontainers-spring-junit5/src/main/docs/testcontainers-spring-junit5.adoc
@@ -1,9 +1,28 @@
 = Testcontainers Spring
 
-*Available since 2.22.0*
+*Available since 3.0.0*
 
-Testing camel components is sometime complex because the 3th party system a component interacts with does not provide testing facilities and/or is only available as a native application. To reduce this complexity, *Camel Testcontainers Spring* extends camel spring test support providing a way to create and interact with containerized applications.
+Testing camel components is sometime complex because the 3th party system a component interacts with does not provide testing facilities and/or is only available as a native application. To reduce this complexity, *Camel Testcontainers Spring JUnit 5* extends camel spring test support providing a way to create and interact with containerized applications.
 
-This module is an extension to the camel-testcontainers component to add support for Spring.
+This module is an extension to the camel-testcontainers-junit5 component to add support for Spring.
 Therefore see the documentation for testcontainers for more details.
 
+== Migrating Camel Testcontainers Spring Tests from JUnit 4 to JUnit 5
+Find below some hints to help in migrating camel testcontainers spring tests from JUnit 4 to JUnit 5.
+
+=== Referencing the Camel Testcontainers Spring JUnit5 library in your project
+Projects using `camel-testcontainers-spring` would need to use `camel-testcontainers-spring-junit5`. For instance, maven users would update their pom.xml file as below:
+----
+<dependency>
+  <groupId>org.apache.camel</groupId>
+  <artifactId>camel-testcontainers-spring-junit5</artifactId>
+  <scope>test</scope>
+</dependency>
+----
+
+Tips: It's possible to run JUnit4 & JUnit5 based camel tests side by side including the following dependencies `camel-testcontainers-spring`,
+`camel-testcontainers-spring-junit5` and `junit-vintage-engine`. This configuration allows to migrate a camel test at once.
+
+=== Typical migration steps linked to JUnit 5 support in Camel Testcontainers Spring
+* Migration steps linked to xref:components::testcontainers-junit5.adoc[JUnit 5 support in Camel Testcontainers itself] should have been applied first
+* Imports of `org.apache.camel.test.testcontainers.spring.\*` should be replaced with `org.apache.camel.test.testcontainers.spring.junit5.*`
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index 0614488..3134560 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -762,7 +762,7 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
 == Miscellaneous Components
 
 // others: START
-Number of Miscellaneous Components: 38 in 38 JAR artifacts (0 deprecated)
+Number of Miscellaneous Components: 39 in 39 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -776,6 +776,8 @@ Number of Miscellaneous Components: 38 in 38 JAR artifacts (0 deprecated)
 
 | xref:cdi.adoc[CDI] (camel-cdi) | 2.10 | Using Camel with CDI
 
+| xref:consul.adoc[Consul] (camel-consul) |  | Camel Consul support
+
 | xref:cxf-transport.adoc[CXF Transport] (camel-cxf-transport) | 2.8 | Camel Transport for Apache CXF
 
 | xref:hystrix.adoc[Hystrix] (camel-hystrix) | 2.18 | Circuit Breaker EIP using Netflix Hystrix
diff --git a/docs/components/modules/ROOT/pages/testcontainers-spring-junit5.adoc b/docs/components/modules/ROOT/pages/testcontainers-spring-junit5.adoc
index 86b1f77..0519db3 100644
--- a/docs/components/modules/ROOT/pages/testcontainers-spring-junit5.adoc
+++ b/docs/components/modules/ROOT/pages/testcontainers-spring-junit5.adoc
@@ -1,10 +1,29 @@
 = Testcontainers Spring
 :page-source: components/camel-testcontainers-spring-junit5/src/main/docs/testcontainers-spring-junit5.adoc
 
-*Available since 2.22.0*
+*Available since 3.0.0*
 
-Testing camel components is sometime complex because the 3th party system a component interacts with does not provide testing facilities and/or is only available as a native application. To reduce this complexity, *Camel Testcontainers Spring* extends camel spring test support providing a way to create and interact with containerized applications.
+Testing camel components is sometime complex because the 3th party system a component interacts with does not provide testing facilities and/or is only available as a native application. To reduce this complexity, *Camel Testcontainers Spring JUnit 5* extends camel spring test support providing a way to create and interact with containerized applications.
 
-This module is an extension to the camel-testcontainers component to add support for Spring.
+This module is an extension to the camel-testcontainers-junit5 component to add support for Spring.
 Therefore see the documentation for testcontainers for more details.
 
+== Migrating Camel Testcontainers Spring Tests from JUnit 4 to JUnit 5
+Find below some hints to help in migrating camel testcontainers spring tests from JUnit 4 to JUnit 5.
+
+=== Referencing the Camel Testcontainers Spring JUnit5 library in your project
+Projects using `camel-testcontainers-spring` would need to use `camel-testcontainers-spring-junit5`. For instance, maven users would update their pom.xml file as below:
+----
+<dependency>
+  <groupId>org.apache.camel</groupId>
+  <artifactId>camel-testcontainers-spring-junit5</artifactId>
+  <scope>test</scope>
+</dependency>
+----
+
+Tips: It's possible to run JUnit4 & JUnit5 based camel tests side by side including the following dependencies `camel-testcontainers-spring`,
+`camel-testcontainers-spring-junit5` and `junit-vintage-engine`. This configuration allows to migrate a camel test at once.
+
+=== Typical migration steps linked to JUnit 5 support in Camel Testcontainers Spring
+* Migration steps linked to xref:components::testcontainers-junit5.adoc[JUnit 5 support in Camel Testcontainers itself] should have been applied first
+* Imports of `org.apache.camel.test.testcontainers.spring.\*` should be replaced with `org.apache.camel.test.testcontainers.spring.junit5.*`
\ No newline at end of file


[camel] 02/02: CAMEL-14084: Migrated remaining camel-consul tests to JUnit 5

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ae2dff6aa05d44166f32299276055197e98c3333
Author: aldettinger <al...@gmail.com>
AuthorDate: Fri Oct 25 17:24:00 2019 +0200

    CAMEL-14084: Migrated remaining camel-consul tests to JUnit 5
---
 components/camel-consul/pom.xml                            | 11 +++++------
 .../cluster/ConsulClusteredRoutePolicyFactoryMain.java     |  2 +-
 .../cluster/ConsulClusteredRoutePolicyFactoryTest.java     | 14 ++++++++------
 .../consul/cluster/ConsulClusteredRoutePolicyTest.java     | 14 ++++++++------
 .../camel/component/consul/cluster/ConsulMasterTest.java   | 14 ++++++++------
 parent/pom.xml                                             |  5 +++++
 6 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 282cfed..2f1e666 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -59,11 +59,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-mock</artifactId>
             <scope>test</scope>
@@ -144,9 +139,13 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
-
     <profiles>
         <profile>
             <id>consul-skip-tests</id>
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
index 38259f6..e26c45d 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
@@ -50,7 +50,7 @@ public final class ConsulClusteredRoutePolicyFactoryMain {
             }
         });
 
-        main.addRouteBuilder(new RouteBuilder() {
+        main.addRoutesBuilder(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
                 from("timer:clustered?delay=1s&period=1s")
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
index 80d3f0c..eed51e3 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
@@ -31,16 +31,18 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.consul.ConsulTestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
+@Testcontainers
 public class ConsulClusteredRoutePolicyFactoryTest {
 
-    @ClassRule
+    @Container
     public static GenericContainer container = ConsulTestSupport.consulContainer();
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConsulClusteredRoutePolicyFactoryTest.class);
@@ -62,8 +64,8 @@ public class ConsulClusteredRoutePolicyFactoryTest {
         LATCH.await(1, TimeUnit.MINUTES);
         SCHEDULER.shutdownNow();
 
-        Assert.assertEquals(CLIENTS.size(), RESULTS.size());
-        Assert.assertTrue(RESULTS.containsAll(CLIENTS));
+        Assertions.assertEquals(CLIENTS.size(), RESULTS.size());
+        Assertions.assertTrue(RESULTS.containsAll(CLIENTS));
     }
 
     // ************************************
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
index cb06bb6..a7867d3 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
@@ -31,16 +31,18 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.consul.ConsulTestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
+@Testcontainers
 public class ConsulClusteredRoutePolicyTest {
 
-    @ClassRule
+    @Container
     public static GenericContainer container = ConsulTestSupport.consulContainer();
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConsulClusteredRoutePolicyTest.class);
@@ -62,8 +64,8 @@ public class ConsulClusteredRoutePolicyTest {
         LATCH.await(1, TimeUnit.MINUTES);
         SCHEDULER.shutdownNow();
 
-        Assert.assertEquals(CLIENTS.size(), RESULTS.size());
-        Assert.assertTrue(RESULTS.containsAll(CLIENTS));
+        Assertions.assertEquals(CLIENTS.size(), RESULTS.size());
+        Assertions.assertTrue(RESULTS.containsAll(CLIENTS));
     }
 
     // ************************************
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterTest.java
index 90129b2..0a609ff 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterTest.java
@@ -30,16 +30,18 @@ import com.orbitz.consul.Consul;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.consul.ConsulTestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
+@Testcontainers
 public class ConsulMasterTest {
 
-    @ClassRule
+    @Container
     public static GenericContainer container = ConsulTestSupport.consulContainer();
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConsulMasterTest.class);
@@ -61,8 +63,8 @@ public class ConsulMasterTest {
         LATCH.await(1, TimeUnit.MINUTES);
         SCHEDULER.shutdownNow();
 
-        Assert.assertEquals(CLIENTS.size(), RESULTS.size());
-        Assert.assertTrue(RESULTS.containsAll(CLIENTS));
+        Assertions.assertEquals(CLIENTS.size(), RESULTS.size());
+        Assertions.assertTrue(RESULTS.containsAll(CLIENTS));
     }
 
     // ************************************
diff --git a/parent/pom.xml b/parent/pom.xml
index 3af91aa..941517a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4870,6 +4870,11 @@
                 <artifactId>httpunit</artifactId>
                 <version>${httpunit-version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${testcontainers-version}</version>
+            </dependency>
 
             <!-- default JPA support -->
             <dependency>