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 92ab77fb712c34fac4f1f6ed7c145f5e231fb9a7 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Tue Jun 30 10:01:51 2020 +0200 [CAMEL-11807] Upgrade camel-jgroups-raft to junit5 --- components/camel-jgroups-raft/pom.xml | 6 +++--- .../camel/component/jgroups/raft/JGroupsRaftAbstractTest.java | 4 +++- .../jgroups/raft/JGroupsRaftComponentConfiguredTest.java | 7 +++++-- .../component/jgroups/raft/JGroupsRaftComponentDefaultTest.java | 9 +++++++-- .../camel/component/jgroups/raft/JGroupsRaftConsumerTest.java | 2 +- .../camel/component/jgroups/raft/JGroupsRaftEndpointTest.java | 7 +++++-- .../camel/component/jgroups/raft/JGroupsRaftProducerTest.java | 4 +++- .../raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java | 4 ++-- .../component/jgroups/raft/cluster/JGroupsRaftMasterTest.java | 4 ++-- 9 files changed, 31 insertions(+), 16 deletions(-) diff --git a/components/camel-jgroups-raft/pom.xml b/components/camel-jgroups-raft/pom.xml index 0f26856..ec341e5 100644 --- a/components/camel-jgroups-raft/pom.xml +++ b/components/camel-jgroups-raft/pom.xml @@ -52,13 +52,13 @@ <!-- Testing dependencies --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <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-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java index 042e2cc..6f0af5f 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftAbstractTest.java @@ -19,10 +19,12 @@ package org.apache.camel.component.jgroups.raft; import java.util.concurrent.TimeUnit; import org.apache.camel.Exchange; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.jgroups.Address; import org.jgroups.raft.RaftHandle; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public abstract class JGroupsRaftAbstractTest extends CamelTestSupport { protected void checkHeaders(Exchange exchange) { assertNotNull(exchange.getIn().getHeader(JGroupsRaftConstants.HEADER_JGROUPSRAFT_COMMIT_INDEX, int.class)); diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java index d1db8fb..769f036 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentConfiguredTest.java @@ -18,10 +18,13 @@ package org.apache.camel.component.jgroups.raft; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jgroups.raft.utils.NopStateMachine; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.jgroups.JChannel; import org.jgroups.raft.RaftHandle; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class JGroupsRaftComponentConfiguredTest extends CamelTestSupport { diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java index 0a4a577..c11d165 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java @@ -18,8 +18,13 @@ package org.apache.camel.component.jgroups.raft; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jgroups.raft.utils.NopStateMachine; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JGroupsRaftComponentDefaultTest extends CamelTestSupport { diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftConsumerTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftConsumerTest.java index 95d9306..6e587e6 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftConsumerTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftConsumerTest.java @@ -19,7 +19,7 @@ package org.apache.camel.component.jgroups.raft; 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; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointTest.java index 1e48fc0..833ef3b 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointTest.java @@ -22,11 +22,14 @@ import java.io.DataOutput; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.jgroups.raft.utils.NopStateMachine; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.jgroups.JChannel; import org.jgroups.protocols.raft.StateMachine; import org.jgroups.raft.RaftHandle; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class JGroupsRaftEndpointTest extends CamelTestSupport { diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftProducerTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftProducerTest.java index bb4f184..c86ae05 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftProducerTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftProducerTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.jgroups.raft; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class JGroupsRaftProducerTest extends JGroupsRaftAbstractTest { private static final String CLUSTER_NAME = "JGroupsRaftProducerTest"; diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java index 7ce23e5..548325f 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java @@ -26,11 +26,11 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.cluster.ClusteredRoutePolicy; import org.jgroups.JChannel; import org.jgroups.raft.RaftHandle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class JGroupsRaftClusteredRoutePolicyTest extends JGroupsRaftClusterAbstractTest { private static final Logger LOG = LoggerFactory.getLogger(JGroupsRaftClusteredRoutePolicyTest.class); diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java index ae816b7..9b89356 100644 --- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java +++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java @@ -27,11 +27,11 @@ import org.apache.camel.component.master.MasterConsumer; import org.apache.camel.impl.DefaultCamelContext; import org.jgroups.JChannel; import org.jgroups.raft.RaftHandle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class JGroupsRaftMasterTest extends JGroupsRaftClusterAbstractTest { private static final Logger LOG = LoggerFactory.getLogger(JGroupsRaftMasterTest.class);