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 4b3bf4fbfccddc582994f5a6d07c620d8382e2b4 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Tue Jun 30 09:06:17 2020 +0200 [CAMEL-11807] Upgrade camel-iota to junit5 --- components/camel-iota/pom.xml | 6 +++--- .../apache/camel/component/iota/IOTAProducerTest.java | 18 +++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/components/camel-iota/pom.xml b/components/camel-iota/pom.xml index 9a8dba8..dae98ab 100644 --- a/components/camel-iota/pom.xml +++ b/components/camel-iota/pom.xml @@ -57,7 +57,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> @@ -66,8 +66,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java b/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java index 39196b3..5860e02 100644 --- a/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java +++ b/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java @@ -18,10 +18,12 @@ package org.apache.camel.component.iota; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.iota.jota.error.InternalException; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class IOTAProducerTest extends CamelTestSupport { @@ -30,7 +32,9 @@ public class IOTAProducerTest extends CamelTestSupport { private static final String IOTA_NODE_URL = "https://nodes.thetangle.org:443"; - @Ignore + private static final Logger LOG = LoggerFactory.getLogger(IOTAProducerTest.class); + + @Disabled @Test public void sendTransferTest() throws Exception { final String message = "ILOVEAPACHECAMEL"; @@ -46,7 +50,7 @@ public class IOTAProducerTest extends CamelTestSupport { if (!flaky) { throw e; } else { - log.warn("Flaky test as IOTA is not online and returning a response in time"); + LOG.warn("Flaky test as IOTA is not online and returning a response in time"); return; } } @@ -68,7 +72,7 @@ public class IOTAProducerTest extends CamelTestSupport { if (!flaky) { throw e; } else { - log.warn("Flaky test as IOTA is not online and returning a response in time"); + LOG.warn("Flaky test as IOTA is not online and returning a response in time"); return; } } @@ -90,7 +94,7 @@ public class IOTAProducerTest extends CamelTestSupport { if (!flaky) { throw e; } else { - log.warn("Flaky test as IOTA is not online and returning a response in time"); + LOG.warn("Flaky test as IOTA is not online and returning a response in time"); return; } }