This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new ff47d92 CAMEL-11807 Migrated camel-djl/dns/docker tests to JUnit 5
ff47d92 is described below
commit ff47d92d2f711d93d9bd5b5b36b1c72613629412
Author: aldettinger <[email protected]>
AuthorDate: Fri May 15 19:06:13 2020 +0200
CAMEL-11807 Migrated camel-djl/dns/docker tests to JUnit 5
---
components/camel-djl/pom.xml | 2 +-
.../djl/ImageClassificationLocalTest.java | 10 +++++---
.../component/djl/ImageClassificationTest.java | 8 +++---
.../camel/component/djl/ObjectDetectionTest.java | 8 +++---
components/camel-dns/pom.xml | 7 +----
.../component/dns/DnsDigEndpointSpringTest.java | 10 ++++----
.../camel/component/dns/DnsDigEndpointTest.java | 14 +++++-----
.../component/dns/DnsIpEndpointSpringTest.java | 19 ++++++++------
.../camel/component/dns/DnsIpEndpointTest.java | 23 +++++++++--------
.../component/dns/DnsIpHeaderTransferTest.java | 23 +++++++++--------
.../component/dns/DnsLookupEndpointSpringTest.java | 23 +++++++++--------
.../camel/component/dns/DnsLookupEndpointTest.java | 27 ++++++++++---------
.../component/dns/WikipediaEndpointSpringTest.java | 10 ++++----
.../camel/component/dns/WikipediaEndpointTest.java | 14 +++++-----
.../dns/cloud/DnsServiceDiscoveryTest.java | 30 ++++++++++++----------
.../component/dns/policy/DnsActivationTest.java | 12 ++++-----
components/camel-docker/pom.xml | 4 +--
.../component/docker/DockerClientProfileTest.java | 28 ++++++++++----------
.../component/docker/DockerConfigurationTest.java | 12 ++++-----
.../camel/component/docker/DockerHelperTest.java | 6 ++---
.../component/docker/RemoveImageCmdUriTest.java | 16 +++++-------
.../docker/consumer/DockerEventsConsumerTest.java | 14 +++++-----
.../docker/consumer/DockerStatsConsumerTest.java | 14 +++++-----
.../headers/AttachContainerCmdHeaderTest.java | 4 +--
.../docker/headers/AuthCmdHeaderTest.java | 4 +--
.../docker/headers/BaseDockerHeaderTest.java | 16 ++++++------
.../docker/headers/BuildImageCmdHeaderTest.java | 17 ++++++------
.../headers/CommitContainerCmdHeaderTest.java | 4 +--
.../headers/ConnectToNetworkCmdHeaderTest.java | 4 +--
.../headers/CopyFileContainerCmdHeaderTest.java | 4 +--
.../headers/CreateContainerCmdHeaderTest.java | 4 +--
.../docker/headers/CreateImageCmdHeaderTest.java | 4 +--
.../docker/headers/CreateNetworkCmdHeaderTest.java | 4 +--
.../docker/headers/DiffContainerCmdHeaderTest.java | 4 +--
.../docker/headers/ExecCreateCmdHeaderTest.java | 4 +--
.../docker/headers/ExecStartCmdHeaderTest.java | 4 +--
.../docker/headers/InfoCmdHeaderTest.java | 4 +--
.../headers/InspectContainerCmdHeaderTest.java | 4 +--
.../docker/headers/InspectImageCmdHeaderTest.java | 4 +--
.../docker/headers/KillContainerCmdHeaderTest.java | 4 +--
.../headers/ListContainersCmdHeaderTest.java | 4 +--
.../docker/headers/ListImagesCmdHeaderTest.java | 4 +--
.../docker/headers/LogContainerCmdHeaderTest.java | 4 +--
.../headers/PauseContainerCmdHeaderTest.java | 4 +--
.../docker/headers/PingCmdHeaderTest.java | 4 +--
.../docker/headers/PullImageCmdHeaderTest.java | 4 +--
.../docker/headers/PushImageCmdHeaderTest.java | 4 +--
.../headers/RemoveContainerCmdHeaderTest.java | 4 +--
.../docker/headers/RemoveImageCmdHeaderTest.java | 4 +--
.../docker/headers/RemoveNetworkCmdHeaderTest.java | 4 +--
.../headers/RestartContainerCmdHeaderTest.java | 4 +--
.../docker/headers/SearchImagesCmdHeaderTest.java | 4 +--
.../headers/StartContainerCmdHeaderTest.java | 4 +--
.../docker/headers/StopContainerCmdHeaderTest.java | 4 +--
.../docker/headers/TagImageCmdHeaderTest.java | 4 +--
.../docker/headers/TopContainerCmdHeaderTest.java | 4 +--
.../headers/UnpauseContainerCmdHeaderTest.java | 4 +--
.../docker/headers/VersionCmdHeaderTest.java | 4 +--
.../docker/headers/WaitContainerCmdHeaderTest.java | 4 +--
.../it/DockerCustomCmdExecFactoryTestIT.java | 6 ++---
.../component/docker/it/DockerITTestSupport.java | 2 +-
.../docker/it/DockerNettyCmdExecFactoryTestIT.java | 6 ++---
.../component/docker/it/DockerProducerTestIT.java | 6 ++---
.../docker/it/DockerStatsConsumerTestIT.java | 6 ++---
64 files changed, 269 insertions(+), 260 deletions(-)
diff --git a/components/camel-djl/pom.xml b/components/camel-djl/pom.xml
index e5873d8..e7691aa 100644
--- a/components/camel-djl/pom.xml
+++ b/components/camel-djl/pom.xml
@@ -77,7 +77,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-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationLocalTest.java
b/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationLocalTest.java
index e66e9b6..a92ad2c 100644
---
a/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationLocalTest.java
+++
b/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationLocalTest.java
@@ -32,11 +32,13 @@ import ai.djl.translate.Pipeline;
import ai.djl.translate.TranslateException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class ImageClassificationLocalTest extends CamelTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(ImageClassificationLocalTest.class);
@@ -44,7 +46,7 @@ public class ImageClassificationLocalTest extends
CamelTestSupport {
private static final String MODEL_NAME = "mlp";
@Test
- public void testDJL() throws Exception {
+ void testDJL() throws Exception {
LOG.info("Read and load local model");
loadLocalModel();
@@ -58,7 +60,7 @@ public class ImageClassificationLocalTest extends
CamelTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("file:src/test/resources/data/mnist?recursive=true&noop=true")
diff --git
a/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationTest.java
b/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationTest.java
index 2391adf..e51d1c9 100644
---
a/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationTest.java
+++
b/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationTest.java
@@ -19,20 +19,20 @@ package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class ImageClassificationTest extends CamelTestSupport {
@Test
- public void testDJL() throws Exception {
+ void testDJL() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(98);
mock.await();
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("file:src/test/resources/data/mnist?recursive=true&noop=true")
diff --git
a/components/camel-djl/src/test/java/org/apache/camel/component/djl/ObjectDetectionTest.java
b/components/camel-djl/src/test/java/org/apache/camel/component/djl/ObjectDetectionTest.java
index d1a26c1..2c58f83 100644
---
a/components/camel-djl/src/test/java/org/apache/camel/component/djl/ObjectDetectionTest.java
+++
b/components/camel-djl/src/test/java/org/apache/camel/component/djl/ObjectDetectionTest.java
@@ -19,20 +19,20 @@ package org.apache.camel.component.djl;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class ObjectDetectionTest extends CamelTestSupport {
@Test
- public void testDJL() throws Exception {
+ void testDJL() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(3);
mock.await();
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("file:src/test/resources/data/detect?recursive=true&noop=true")
diff --git a/components/camel-dns/pom.xml b/components/camel-dns/pom.xml
index a6a0e4b..b8381ec 100644
--- a/components/camel-dns/pom.xml
+++ b/components/camel-dns/pom.xml
@@ -46,7 +46,7 @@
<!-- Testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -69,11 +69,6 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java
index 0554d4e..38e1547 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java
@@ -25,9 +25,9 @@ import org.apache.camel.Predicate;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.xbill.DNS.Message;
@@ -55,8 +55,8 @@ public class DnsDigEndpointSpringTest extends
CamelSpringTestSupport {
}
@Test
- @Ignore("Testing behind nat produces timeouts")
- public void testDigForMonkey() throws Exception {
+ @Disabled("Testing behind nat produces timeouts")
+ void testDigForMonkey() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.expectedMessagesMatches(new Predicate() {
public boolean matches(Exchange exchange) {
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
index 7d78f0f..6a4c7ca 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
@@ -26,16 +26,16 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xbill.DNS.Message;
import org.xbill.DNS.Section;
/**
* Tests for the dig endpoint.
*/
-@Ignore("Wikipedia service is broken now")
+@Disabled("Wikipedia service is broken now")
public class DnsDigEndpointTest extends CamelTestSupport {
private static final String RESPONSE_MONKEY = "\"A Macaque, an old world
species of "
@@ -52,17 +52,17 @@ public class DnsDigEndpointTest extends CamelTestSupport {
protected ProducerTemplate template;
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("dns:dig").to("mock:result");
}
};
}
@Test
- public void testDigForMonkey() throws Exception {
+ void testDigForMonkey() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.expectedMessagesMatches(new Predicate() {
public boolean matches(Exchange exchange) {
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java
index 543f633..a88f2c6 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointSpringTest.java
@@ -20,12 +20,15 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Disabled;
+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;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* A series of tests to check the IP lookup operation.
*/
@@ -38,7 +41,7 @@ public class DnsIpEndpointSpringTest extends
CamelSpringTestSupport {
protected ProducerTemplate template;
@Test
- public void testNullIPRequests() throws Exception {
+ void testNullIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
template.sendBodyAndHeader("hello", "dns.domain", null);
@@ -50,7 +53,7 @@ public class DnsIpEndpointSpringTest extends
CamelSpringTestSupport {
}
@Test
- public void testEmptyIPRequests() throws Exception {
+ void testEmptyIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
template.sendBodyAndHeader("hello", "dns.domain", "");
@@ -62,11 +65,11 @@ public class DnsIpEndpointSpringTest extends
CamelSpringTestSupport {
}
@Test
- @Ignore("Run manually, performs DNS lookup to remote apache.org server")
- public void testValidIPRequests() throws Exception {
+ @Disabled("Run manually, performs DNS lookup to remote apache.org server")
+ void testValidIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(1);
- resultEndpoint.expectedBodiesReceived("140.211.11.131");
+ resultEndpoint.expectedBodiesReceived("40.79.78.1");
template.sendBodyAndHeader("hello", "dns.domain", "www.apache.org");
resultEndpoint.assertIsSatisfied();
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java
index 58199f3..a6bfa72 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpEndpointTest.java
@@ -21,9 +21,12 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* A series of tests to check the IP lookup operation.
@@ -37,17 +40,17 @@ public class DnsIpEndpointTest extends CamelTestSupport {
protected ProducerTemplate template;
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("dns:ip").to("mock:result");
}
};
}
@Test
- public void testNullIPRequests() throws Exception {
+ void testNullIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
template.sendBodyAndHeader("hello", "dns.domain", null);
@@ -59,7 +62,7 @@ public class DnsIpEndpointTest extends CamelTestSupport {
}
@Test
- public void testEmptyIPRequests() throws Exception {
+ void testEmptyIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
template.sendBodyAndHeader("hello", "dns.domain", "");
@@ -71,11 +74,11 @@ public class DnsIpEndpointTest extends CamelTestSupport {
}
@Test
- @Ignore("Run manually, performs DNS lookup to remote apache.org server")
- public void testValidIPRequests() throws Exception {
+ @Disabled("Run manually, performs DNS lookup to remote apache.org server")
+ void testValidIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(1);
- resultEndpoint.expectedBodiesReceived("140.211.11.131");
+ resultEndpoint.expectedBodiesReceived("40.79.78.1");
template.sendBodyAndHeader("hello", "dns.domain", "www.apache.org");
resultEndpoint.assertIsSatisfied();
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java
index 7c7ad26..a52d8ad 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java
@@ -21,9 +21,12 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class DnsIpHeaderTransferTest extends CamelTestSupport {
@@ -34,17 +37,17 @@ public class DnsIpHeaderTransferTest extends
CamelTestSupport {
protected ProducerTemplate template;
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").setHeader("foo",
constant("bar")).to("dns:ip").to("mock:result");
}
};
}
@Test
- public void testNullIPRequests() throws Exception {
+ void testNullIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
@@ -57,7 +60,7 @@ public class DnsIpHeaderTransferTest extends CamelTestSupport
{
}
@Test
- public void testEmptyIPRequests() throws Exception {
+ void testEmptyIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
@@ -70,11 +73,11 @@ public class DnsIpHeaderTransferTest extends
CamelTestSupport {
}
@Test
- @Ignore("Run manually, performs DNS lookup to remote apache.org server")
- public void testValidIPRequests() throws Exception {
+ @Disabled("Run manually, performs DNS lookup to remote apache.org server")
+ void testValidIPRequests() throws Exception {
resultEndpoint.expectedMessageCount(1);
- resultEndpoint.expectedBodiesReceived("140.211.11.131");
+ resultEndpoint.expectedBodiesReceived("40.79.78.1");
resultEndpoint.expectedHeaderReceived("foo", "bar");
template.sendBodyAndHeader("hello", "dns.domain", "www.apache.org");
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
index 0f7bd9a..50fec62 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
@@ -25,13 +25,16 @@ import org.apache.camel.Predicate;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.xbill.DNS.Record;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* A set of test cases to make DNS lookups.
*/
@@ -44,7 +47,7 @@ public class DnsLookupEndpointSpringTest extends
CamelSpringTestSupport {
protected ProducerTemplate template;
@Test
- public void testDNSWithNoHeaders() throws Exception {
+ void testDNSWithNoHeaders() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
template.sendBody("hello");
@@ -56,20 +59,20 @@ public class DnsLookupEndpointSpringTest extends
CamelSpringTestSupport {
}
@Test
- public void testDNSWithEmptyNameHeader() throws Exception {
+ void testDNSWithEmptyNameHeader() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
template.sendBodyAndHeader("hello", "dns.name", "");
fail("Should have thrown exception");
} catch (Throwable t) {
- assertTrue(t.toString(), t.getCause() instanceof
IllegalArgumentException);
+ assertTrue(t.getCause() instanceof IllegalArgumentException,
t.toString());
}
resultEndpoint.assertIsSatisfied();
}
@Test
- @Ignore("Testing behind nat produces timeouts")
- public void testDNSWithNameHeader() throws Exception {
+ @Disabled("Testing behind nat produces timeouts")
+ void testDNSWithNameHeader() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.expectedMessagesMatches(new Predicate() {
public boolean matches(Exchange exchange) {
@@ -84,8 +87,8 @@ public class DnsLookupEndpointSpringTest extends
CamelSpringTestSupport {
}
@Test
- @Ignore("Testing behind nat produces timeouts")
- public void testDNSWithNameHeaderAndType() throws Exception {
+ @Disabled("Testing behind nat produces timeouts")
+ void testDNSWithNameHeaderAndType() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.expectedMessagesMatches(new Predicate() {
public boolean matches(Exchange exchange) {
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
index 52c8358..f0042bc 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
@@ -26,11 +26,14 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.xbill.DNS.Record;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* A set of test cases to make DNS lookups.
*/
@@ -43,17 +46,17 @@ public class DnsLookupEndpointTest extends CamelTestSupport
{
protected ProducerTemplate template;
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("dns:lookup").to("mock:result");
}
};
}
@Test
- public void testDNSWithNoHeaders() throws Exception {
+ void testDNSWithNoHeaders() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
template.sendBody("hello");
@@ -65,20 +68,20 @@ public class DnsLookupEndpointTest extends CamelTestSupport
{
}
@Test
- public void testDNSWithEmptyNameHeader() throws Exception {
+ void testDNSWithEmptyNameHeader() throws Exception {
resultEndpoint.expectedMessageCount(0);
try {
template.sendBodyAndHeader("hello", "dns.name", "");
fail("Should have thrown exception");
} catch (Throwable t) {
- assertTrue(t.toString(), t.getCause() instanceof
IllegalArgumentException);
+ assertTrue(t.getCause() instanceof IllegalArgumentException,
t.toString());
}
resultEndpoint.assertIsSatisfied();
}
@Test
- @Ignore("Testing behind nat produces timeouts")
- public void testDNSWithNameHeader() throws Exception {
+ @Disabled("Testing behind nat produces timeouts")
+ void testDNSWithNameHeader() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.expectedMessagesMatches(new Predicate() {
public boolean matches(Exchange exchange) {
@@ -93,8 +96,8 @@ public class DnsLookupEndpointTest extends CamelTestSupport {
}
@Test
- @Ignore("Testing behind nat produces timeouts")
- public void testDNSWithNameHeaderAndType() throws Exception {
+ @Disabled("Testing behind nat produces timeouts")
+ void testDNSWithNameHeaderAndType() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.expectedMessagesMatches(new Predicate() {
public boolean matches(Exchange exchange) {
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java
index 9fb9104..9e38693 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java
@@ -25,9 +25,9 @@ import org.apache.camel.Predicate;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -47,8 +47,8 @@ public class WikipediaEndpointSpringTest extends
CamelSpringTestSupport {
protected ProducerTemplate template;
@Test
- @Ignore("Testing behind nat produces timeouts")
- public void testWikipediaForMonkey() throws Exception {
+ @Disabled("Testing behind nat produces timeouts")
+ void testWikipediaForMonkey() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.expectedMessagesMatches(new Predicate() {
public boolean matches(Exchange exchange) {
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java
index 9ca4974..5df2935 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java
@@ -26,9 +26,9 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* A test case to check wikipedia records.
@@ -46,18 +46,18 @@ public class WikipediaEndpointTest extends CamelTestSupport
{
protected ProducerTemplate template;
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").to("dns:wikipedia").to("mock:result");
}
};
}
@Test
- @Ignore("Testing behind nat produces timeouts")
- public void testWikipediaForMonkey() throws Exception {
+ @Disabled("Testing behind nat produces timeouts")
+ void testWikipediaForMonkey() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.expectedMessagesMatches(new Predicate() {
public boolean matches(Exchange exchange) {
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/cloud/DnsServiceDiscoveryTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/cloud/DnsServiceDiscoveryTest.java
index 60c3aa7..d8b46e5 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/cloud/DnsServiceDiscoveryTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/cloud/DnsServiceDiscoveryTest.java
@@ -16,32 +16,34 @@
*/
package org.apache.camel.component.dns.cloud;
+import java.io.IOException;
import java.util.List;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.dns.DnsConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class DnsServiceDiscoveryTest {
@Test
- public void testServiceDiscovery() throws Exception {
+ void testServiceDiscovery() throws IOException {
DnsConfiguration configuration = new DnsConfiguration();
- DnsServiceDiscovery discovery = new DnsServiceDiscovery(configuration);
+ try (DnsServiceDiscovery discovery = new
DnsServiceDiscovery(configuration)) {
- configuration.setDomain("gmail.com");
- configuration.setProto("_tcp");
+ configuration.setDomain("gmail.com");
+ configuration.setProto("_tcp");
- List<ServiceDefinition> services =
discovery.getServices("_xmpp-server");
- assertNotNull(services);
- assertFalse(services.isEmpty());
+ List<ServiceDefinition> services =
discovery.getServices("_xmpp-server");
+ assertNotNull(services);
+ assertFalse(services.isEmpty());
- for (ServiceDefinition service : services) {
- assertFalse(service.getMetadata().isEmpty());
- assertNotNull(service.getMetadata().get("priority"));
- assertNotNull(service.getMetadata().get("weight"));
+ for (ServiceDefinition service : services) {
+ assertFalse(service.getMetadata().isEmpty());
+ assertNotNull(service.getMetadata().get("priority"));
+ assertNotNull(service.getMetadata().get("weight"));
+ }
}
}
}
diff --git
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/policy/DnsActivationTest.java
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/policy/DnsActivationTest.java
index eb08b25..c35d978 100644
---
a/components/camel-dns/src/test/java/org/apache/camel/component/dns/policy/DnsActivationTest.java
+++
b/components/camel-dns/src/test/java/org/apache/camel/component/dns/policy/DnsActivationTest.java
@@ -18,17 +18,17 @@ package org.apache.camel.component.dns.policy;
import java.util.Arrays;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-@Ignore("Manual test as cannot run reliable on all platforms")
+@Disabled("Manual test as cannot run reliable on all platforms")
public class DnsActivationTest {
@Test
- public void testDnsActivation() throws Exception {
+ void testDnsActivation() throws Exception {
DnsActivation dnsActivationActive = new DnsActivation("localhost",
Arrays.asList("127.0.0.1"));
assertTrue(dnsActivationActive.isActive());
diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml
index e33c479..790f9d7 100644
--- a/components/camel-docker/pom.xml
+++ b/components/camel-docker/pom.xml
@@ -82,12 +82,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java
index 7f0fa04..9315589 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java
@@ -17,22 +17,18 @@
package org.apache.camel.component.docker;
import org.apache.camel.component.docker.exception.DockerException;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Validates the {@link DockerClientProfile}
*/
public class DockerClientProfileTest {
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
@Test
- public void clientProfileTest() {
+ void clientProfileTest() {
String host = "host";
String email = "[email protected]";
String username = "user";
@@ -69,7 +65,7 @@ public class DockerClientProfileTest {
}
@Test
- public void clientProfileUrlTest() throws DockerException {
+ void clientProfileUrlTest() throws DockerException {
DockerClientProfile profile = new DockerClientProfile();
profile.setHost("localhost");
profile.setPort(2375);
@@ -77,15 +73,17 @@ public class DockerClientProfileTest {
}
@Test
- public void clientProfileNoPortSpecifiedUrlTest() throws DockerException {
- DockerClientProfile profile = new DockerClientProfile();
- profile.setHost("localhost");
- expectedException.expectMessage("port must be specified");
- profile.toUrl();
+ void clientProfileNoPortSpecifiedUrlTest() throws DockerException {
+ IllegalArgumentException iaex =
assertThrows(IllegalArgumentException.class, () -> {
+ DockerClientProfile profile = new DockerClientProfile();
+ profile.setHost("localhost");
+ profile.toUrl();
+ });
+ assertEquals("port must be specified", iaex.getMessage());
}
@Test
- public void clientProfileWithSocketUrlTest() throws DockerException {
+ void clientProfileWithSocketUrlTest() throws DockerException {
DockerClientProfile profile = new DockerClientProfile();
profile.setHost("/var/run/docker.sock");
// Port should be ignored
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java
index 314e292..dbec4ed 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java
@@ -23,24 +23,24 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultMessage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DockerConfigurationTest {
private DockerConfiguration configuration;
private CamelContext camelContext;
- @Before
+ @BeforeEach
public void setupTest() {
configuration = new DockerConfiguration();
camelContext = new DefaultCamelContext();
}
@Test
- public void testPropertyFromHeader() {
+ void testPropertyFromHeader() {
String host = "camelhost";
Message message = new DefaultMessage(camelContext);
@@ -51,7 +51,7 @@ public class DockerConfigurationTest {
}
@Test
- public void testPropertyfromEndpointProperties() {
+ void testPropertyfromEndpointProperties() {
String host = "camelhost";
Map<String, Object> parameters = new HashMap<>();
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerHelperTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerHelperTest.java
index be11a2a..14d26ad 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerHelperTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerHelperTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.docker;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DockerHelperTest {
@Test
- public void transformHeaderTestFromHeader() {
+ void transformHeaderTestFromHeader() {
String headerField =
DockerHelper.transformFromHeaderName(DockerConstants.DOCKER_REGISTRY);
assertEquals("registry", headerField);
}
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java
index fa84395..aa39921 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java
@@ -21,8 +21,8 @@ import java.util.Map;
import com.github.dockerjava.api.command.RemoveImageCmd;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.docker.headers.BaseDockerHeaderTest;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -41,25 +41,21 @@ public class RemoveImageCmdUriTest extends
BaseDockerHeaderTest<RemoveImageCmd>
private RemoveImageCmd mockObject;
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
-
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:in").to("docker://" + getOperation().toString() +
"?imageId=" + imageId + "&noPrune=" + noPrune + "&force=" + force);
}
};
}
- @Ignore
+ @Disabled
@Test
- public void removeImageHeaderTest() {
-
+ void removeImageHeaderTest() {
Map<String, Object> headers = getDefaultParameters();
-
template.sendBodyAndHeaders("direct:in", "", headers);
-
Mockito.verify(dockerClient, Mockito.times(1)).removeImageCmd(imageId);
}
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
index 244a70e..338c459 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
@@ -24,19 +24,19 @@ import org.apache.camel.component.docker.DockerComponent;
import org.apache.camel.component.docker.DockerConfiguration;
import org.apache.camel.component.docker.util.DockerTestUtils;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.mockito.ArgumentMatchers.anyString;
/**
* Consumer test for events on Docker Platform
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class DockerEventsConsumerTest extends CamelTestSupport {
private String host = "localhost";
private Integer port = 2375;
@@ -55,13 +55,13 @@ public class DockerEventsConsumerTest extends
CamelTestSupport {
}
@Test
- public void testEvent() throws Exception {
+ void testEvent() {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("docker://events?host=" + host + "&port=" +
port).log("${body}").to("mock:result");
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
index 1e562b9..e11ae37 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
@@ -24,19 +24,19 @@ import org.apache.camel.component.docker.DockerComponent;
import org.apache.camel.component.docker.DockerConfiguration;
import org.apache.camel.component.docker.util.DockerTestUtils;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.mockito.ArgumentMatchers.anyString;
/**
* Consumer test for statistics on Docker Platform
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class DockerStatsConsumerTest extends CamelTestSupport {
private String host = "localhost";
private Integer port = 2375;
@@ -55,13 +55,13 @@ public class DockerStatsConsumerTest extends
CamelTestSupport {
}
@Test
- public void testStats() throws Exception {
+ void testStats() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("docker://stats?host=" + host + "&port=" + port +
"&containerId=" + containerId).log("${body}").to("mock:result");
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java
index 02de6fb..f5e7b2f 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java
@@ -22,7 +22,7 @@ import com.github.dockerjava.api.command.AttachContainerCmd;
import com.github.dockerjava.core.command.AttachContainerResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -42,7 +42,7 @@ public class AttachContainerCmdHeaderTest extends
BaseDockerHeaderTest<AttachCon
private AttachContainerResultCallback callback;
@Test
- public void attachContainerHeaderTest() {
+ void attachContainerHeaderTest() {
String containerId = "9c09acd48a25";
boolean stdOut = true;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java
index 15e712f..0ad5ff7 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java
@@ -23,7 +23,7 @@ import com.github.dockerjava.api.model.AuthConfig;
import org.apache.camel.component.docker.DockerClientProfile;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -43,7 +43,7 @@ public class AuthCmdHeaderTest extends
BaseDockerHeaderTest<AuthCmd> {
private String serverAddress = "http://docker.io/v1";;
@Test
- public void authHeaderTest() {
+ void authHeaderTest() {
String userName = "jdoe";
String password = "password";
String email = "[email protected]";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
index 58114f5..241ef57 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
@@ -27,13 +27,13 @@ import org.apache.camel.component.docker.DockerComponent;
import org.apache.camel.component.docker.DockerConfiguration;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public abstract class BaseDockerHeaderTest<T> extends CamelTestSupport {
@Mock
@@ -45,11 +45,11 @@ public abstract class BaseDockerHeaderTest<T> extends
CamelTestSupport {
T mockObject;
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:in").to("docker://" + getOperation().toString());
}
@@ -57,7 +57,7 @@ public abstract class BaseDockerHeaderTest<T> extends
CamelTestSupport {
}
- @Before
+ @BeforeEach
public void setupTest() {
setupMocks();
}
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java
index 939806b..8abcd16 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java
@@ -24,7 +24,7 @@ import com.github.dockerjava.api.command.BuildImageCmd;
import com.github.dockerjava.core.command.BuildImageResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -55,7 +55,10 @@ public class BuildImageCmdHeaderTest extends
BaseDockerHeaderTest<BuildImageCmd>
private String tag = "1.0";
@Test
- public void buildImageFromInputStreamHeaderTest() {
+ void buildImageFromInputStreamHeaderTest() {
+
Mockito.when(dockerClient.buildImageCmd(any(InputStream.class))).thenReturn(mockObject);
+ Mockito.when(mockObject.exec(any())).thenReturn(callback);
+ Mockito.when(callback.awaitImageId()).thenReturn(anyString());
template.sendBodyAndHeaders("direct:in", inputStream, getHeaders());
@@ -68,7 +71,10 @@ public class BuildImageCmdHeaderTest extends
BaseDockerHeaderTest<BuildImageCmd>
}
@Test
- public void buildImageFromFileHeaderTest() {
+ void buildImageFromFileHeaderTest() {
+
Mockito.when(dockerClient.buildImageCmd(any(File.class))).thenReturn(mockObject);
+ Mockito.when(mockObject.exec(any())).thenReturn(callback);
+ Mockito.when(callback.awaitImageId()).thenReturn(anyString());
template.sendBodyAndHeaders("direct:in", file, getHeaders());
@@ -82,11 +88,6 @@ public class BuildImageCmdHeaderTest extends
BaseDockerHeaderTest<BuildImageCmd>
@Override
protected void setupMocks() {
-
Mockito.when(dockerClient.buildImageCmd(any(InputStream.class))).thenReturn(mockObject);
-
Mockito.when(dockerClient.buildImageCmd(any(File.class))).thenReturn(mockObject);
-
- Mockito.when(mockObject.exec(any())).thenReturn(callback);
- Mockito.when(callback.awaitImageId()).thenReturn(anyString());
}
@Override
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java
index f9b34f9..92ffda5 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java
@@ -25,7 +25,7 @@ import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.api.model.Volumes;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -41,7 +41,7 @@ public class CommitContainerCmdHeaderTest extends
BaseDockerHeaderTest<CommitCmd
private CommitCmd mockObject;
@Test
- public void commitContainerHeaderTest() {
+ void commitContainerHeaderTest() {
String containerId = "9c09acd48a25";
String env = "FOO=bar";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
index a860205..77abc9b 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
@@ -22,7 +22,7 @@ import com.github.dockerjava.api.command.ConnectToNetworkCmd;
import com.github.dockerjava.api.model.ExposedPort;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -40,7 +40,7 @@ public class ConnectToNetworkCmdHeaderTest extends
BaseDockerHeaderTest<ConnectT
private ConnectToNetworkCmd mockObject;
@Test
- public void createNetworkHeaderTest() {
+ void createNetworkHeaderTest() {
String networkId = "ID1234";
String containerId = "CID1234";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java
index 7f63ef5..2905e20 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class CopyFileContainerCmdHeaderTest extends
BaseDockerHeaderTest<CopyArc
private CopyArchiveFromContainerCmd mockObject;
@Test
- public void copyFileFromContainerHeaderTest() {
+ void copyFileFromContainerHeaderTest() {
String containerId = "9c09acd48a25";
String resource = "/test";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
index d351ac0..0f876c8 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
@@ -26,7 +26,7 @@ import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.api.model.VolumesFrom;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -46,7 +46,7 @@ public class CreateContainerCmdHeaderTest extends
BaseDockerHeaderTest<CreateCon
private HostConfig hostConfig;
@Test
- public void createContainerHeaderTest() {
+ void createContainerHeaderTest() {
String image = "busybox";
ExposedPort exposedPort = ExposedPort.tcp(22);
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java
index 1951d8f..fc4a79a 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java
@@ -22,7 +22,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.CreateImageCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -42,7 +42,7 @@ public class CreateImageCmdHeaderTest extends
BaseDockerHeaderTest<CreateImageCm
private InputStream inputStream;
@Test
- public void createImageHeaderTest() {
+ void createImageHeaderTest() {
String repository = "docker/empty";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
index f7a350f..465c9e0 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
@@ -22,7 +22,7 @@ import com.github.dockerjava.api.command.CreateNetworkCmd;
import com.github.dockerjava.api.model.ExposedPort;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -40,7 +40,7 @@ public class CreateNetworkCmdHeaderTest extends
BaseDockerHeaderTest<CreateNetwo
private CreateNetworkCmd mockObject;
@Test
- public void createNetworkHeaderTest() {
+ void createNetworkHeaderTest() {
String networkName = "TestNetwork";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java
index 48e84ac..1d61613 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.ContainerDiffCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -36,7 +36,7 @@ public class DiffContainerCmdHeaderTest extends
BaseDockerHeaderTest<ContainerDi
private ContainerDiffCmd mockObject;
@Test
- public void containerDiffHeaderTest() {
+ void containerDiffHeaderTest() {
String containerId = "9c09acd48a25";
String containerIdDiff = "0f9dfe8defa0";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java
index 89ed78e..e0525eb 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.ExecCreateCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class ExecCreateCmdHeaderTest extends
BaseDockerHeaderTest<ExecCreateCmd>
private ExecCreateCmd mockObject;
@Test
- public void execCreateHeaderTest() {
+ void execCreateHeaderTest() {
String containerId = "9c09acd48a25";
boolean tty = true;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java
index 4c5beb7..9508b45 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java
@@ -22,7 +22,7 @@ import com.github.dockerjava.api.command.ExecStartCmd;
import com.github.dockerjava.core.command.ExecStartResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -42,7 +42,7 @@ public class ExecStartCmdHeaderTest extends
BaseDockerHeaderTest<ExecStartCmd> {
private ExecStartResultCallback callback;
@Test
- public void execCreateHeaderTest() {
+ void execCreateHeaderTest() {
String id = "1";
boolean tty = true;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InfoCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InfoCmdHeaderTest.java
index e242ef2..93e66a4 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InfoCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InfoCmdHeaderTest.java
@@ -20,7 +20,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.InfoCmd;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -33,7 +33,7 @@ public class InfoCmdHeaderTest extends
BaseDockerHeaderTest<InfoCmd> {
private InfoCmd mockObject;
@Test
- public void infoHeaderTest() {
+ void infoHeaderTest() {
Map<String, Object> headers = getDefaultParameters();
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java
index 2f46457..f876dca 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.InspectContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -36,7 +36,7 @@ public class InspectContainerCmdHeaderTest extends
BaseDockerHeaderTest<InspectC
private InspectContainerCmd mockObject;
@Test
- public void inspectContainerHeaderTest() {
+ void inspectContainerHeaderTest() {
String containerId = "9c09acd48a25";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java
index 73b0aa1..c4f175b 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.InspectImageCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class InspectImageCmdHeaderTest extends
BaseDockerHeaderTest<InspectImage
private InspectImageCmd mockObject;
@Test
- public void listImageHeaderTest() {
+ void listImageHeaderTest() {
String imageId = "be29975e0098";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java
index 88ada27..dbcb99e 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.KillContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class KillContainerCmdHeaderTest extends
BaseDockerHeaderTest<KillContain
private KillContainerCmd mockObject;
@Test
- public void stopContainerHeaderTest() {
+ void stopContainerHeaderTest() {
String containerId = "9c09acd48a25";
String signal = "signal";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java
index afe7b7a..34483d0 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.ListContainersCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -36,7 +36,7 @@ public class ListContainersCmdHeaderTest extends
BaseDockerHeaderTest<ListContai
private ListContainersCmd mockObject;
@Test
- public void listContainerHeaderTest() {
+ void listContainerHeaderTest() {
boolean showSize = true;
boolean showAll = false;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java
index a5615e0..a44cf8f 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.ListImagesCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class ListImagesCmdHeaderTest extends
BaseDockerHeaderTest<ListImagesCmd>
private ListImagesCmd mockObject;
@Test
- public void listImageHeaderTest() {
+ void listImageHeaderTest() {
String filter = "{\"dangling\":[\"true\"]}";
Boolean showAll = true;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
index 59bddd2..4f991bd 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
@@ -22,7 +22,7 @@ import com.github.dockerjava.api.command.LogContainerCmd;
import com.github.dockerjava.core.command.LogContainerResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -42,7 +42,7 @@ public class LogContainerCmdHeaderTest extends
BaseDockerHeaderTest<LogContainer
private LogContainerResultCallback callback;
@Test
- public void logContainerHeaderTest() {
+ void logContainerHeaderTest() {
String containerId = "9c09acd48a25";
boolean stdOut = true;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java
index 060cadf..17dac70 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.PauseContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -36,7 +36,7 @@ public class PauseContainerCmdHeaderTest extends
BaseDockerHeaderTest<PauseConta
private PauseContainerCmd mockObject;
@Test
- public void pauseHeaderTest() {
+ void pauseHeaderTest() {
String containerId = "9c09acd48a25";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java
index 44df77f..cbe69c9 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java
@@ -20,7 +20,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.PingCmd;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -33,7 +33,7 @@ public class PingCmdHeaderTest extends
BaseDockerHeaderTest<PingCmd> {
private PingCmd mockObject;
@Test
- public void pingHeaderTest() {
+ void pingHeaderTest() {
Map<String, Object> headers = getDefaultParameters();
template.sendBodyAndHeaders("direct:in", "", headers);
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
index c57e5ca..50b300d 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
@@ -22,7 +22,7 @@ import com.github.dockerjava.api.command.PullImageCmd;
import com.github.dockerjava.core.command.PullImageResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -42,7 +42,7 @@ public class PullImageCmdHeaderTest extends
BaseDockerHeaderTest<PullImageCmd> {
private PullImageResultCallback callback;
@Test
- public void pullImageHeaderTest() {
+ void pullImageHeaderTest() {
String repository = "docker/empty";
String tag = "1.0";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
index 7e254b1..3cd34e9 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
@@ -23,7 +23,7 @@ import
com.github.dockerjava.core.command.PushImageResultCallback;
import org.apache.camel.component.docker.DockerClientProfile;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -49,7 +49,7 @@ public class PushImageCmdHeaderTest extends
BaseDockerHeaderTest<PushImageCmd> {
private String tag = "1.0";
@Test
- public void pushImageHeaderTest() {
+ void pushImageHeaderTest() {
Map<String, Object> headers = getDefaultParameters();
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java
index 51d54a8..47e4ac0 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.RemoveContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class RemoveContainerCmdHeaderTest extends
BaseDockerHeaderTest<RemoveCon
private RemoveContainerCmd mockObject;
@Test
- public void removeContainerHeaderTest() {
+ void removeContainerHeaderTest() {
String containerId = "9c09acd48a25";
boolean force = false;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java
index 0b1ce50..3f31218 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.RemoveImageCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -36,7 +36,7 @@ public class RemoveImageCmdHeaderTest extends
BaseDockerHeaderTest<RemoveImageCm
private RemoveImageCmd mockObject;
@Test
- public void removeImageHeaderTest() {
+ void removeImageHeaderTest() {
String imageId = "be29975e0098";
Boolean noPrune = false;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
index 58307c7..06b8b29 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
@@ -22,7 +22,7 @@ import com.github.dockerjava.api.command.RemoveNetworkCmd;
import com.github.dockerjava.api.model.ExposedPort;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -40,7 +40,7 @@ public class RemoveNetworkCmdHeaderTest extends
BaseDockerHeaderTest<RemoveNetwo
private RemoveNetworkCmd mockObject;
@Test
- public void createNetworkHeaderTest() {
+ void createNetworkHeaderTest() {
String networkId = "ID1234";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java
index 5aa3c2b..01816d7 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.RestartContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class RestartContainerCmdHeaderTest extends
BaseDockerHeaderTest<RestartC
private RestartContainerCmd mockObject;
@Test
- public void restartContainerHeaderTest() {
+ void restartContainerHeaderTest() {
String containerId = "9c09acd48a25";
int timeout = 50;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java
index 84f88de..59ab390 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.SearchImagesCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class SearchImagesCmdHeaderTest extends
BaseDockerHeaderTest<SearchImages
private SearchImagesCmd mockObject;
@Test
- public void searchImagesHeaderTest() {
+ void searchImagesHeaderTest() {
String term = "dockerTerm";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java
index 159537e..a0b7e58 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java
@@ -22,7 +22,7 @@ import com.github.dockerjava.api.command.StartContainerCmd;
import com.github.dockerjava.api.model.ExposedPort;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -40,7 +40,7 @@ public class StartContainerCmdHeaderTest extends
BaseDockerHeaderTest<StartConta
private StartContainerCmd mockObject;
@Test
- public void startContainerHeaderTest() {
+ void startContainerHeaderTest() {
String containerId = "be29975e0098";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java
index 4262777..7c3ec4b 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.StopContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class StopContainerCmdHeaderTest extends
BaseDockerHeaderTest<StopContain
private StopContainerCmd mockObject;
@Test
- public void stopContainerHeaderTest() {
+ void stopContainerHeaderTest() {
String containerId = "9c09acd48a25";
int timeout = 50;
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java
index 1df8327..a1fcd5c 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.TagImageCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -36,7 +36,7 @@ public class TagImageCmdHeaderTest extends
BaseDockerHeaderTest<TagImageCmd> {
private TagImageCmd mockObject;
@Test
- public void tagImageHeaderTest() {
+ void tagImageHeaderTest() {
String imageId = "be29975e0098";
String repository = "docker/empty";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java
index 2d87096..018a601 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.TopContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -37,7 +37,7 @@ public class TopContainerCmdHeaderTest extends
BaseDockerHeaderTest<TopContainer
private TopContainerCmd mockObject;
@Test
- public void topContainerHeaderTest() {
+ void topContainerHeaderTest() {
String containerId = "9c09acd48a25";
String psArgs = "aux";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java
index b8411ed..5e18d8b 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.UnpauseContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -36,7 +36,7 @@ public class UnpauseContainerCmdHeaderTest extends
BaseDockerHeaderTest<UnpauseC
private UnpauseContainerCmd mockObject;
@Test
- public void unpauseHeaderTest() {
+ void unpauseHeaderTest() {
String containerId = "9c09acd48a25";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/VersionCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/VersionCmdHeaderTest.java
index 34ff37e..246da3c 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/VersionCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/VersionCmdHeaderTest.java
@@ -20,7 +20,7 @@ import java.util.Map;
import com.github.dockerjava.api.command.VersionCmd;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -33,7 +33,7 @@ public class VersionCmdHeaderTest extends
BaseDockerHeaderTest<VersionCmd> {
private VersionCmd mockObject;
@Test
- public void pingHeaderTest() {
+ void pingHeaderTest() {
Map<String, Object> headers = getDefaultParameters();
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
index dc92a10..377fd92 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
@@ -22,7 +22,7 @@ import com.github.dockerjava.api.command.WaitContainerCmd;
import com.github.dockerjava.core.command.WaitContainerResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -42,7 +42,7 @@ public class WaitContainerCmdHeaderTest extends
BaseDockerHeaderTest<WaitContain
private WaitContainerResultCallback callback;
@Test
- public void waitContainerHeaderTest() {
+ void waitContainerHeaderTest() {
String containerId = "9c09acd48a25";
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
index 021d20c..0bf417b 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
@@ -21,12 +21,12 @@ import java.util.concurrent.TimeUnit;
import com.github.dockerjava.api.model.Version;
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 DockerCustomCmdExecFactoryTestIT extends DockerITTestSupport {
@Test
- public void testNettyCmdExecFactoryConfig() throws Exception {
+ void testNettyCmdExecFactoryConfig() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.expectedBodiesReceived(FakeDockerCmdExecFactory.FAKE_VERSION);
@@ -38,7 +38,7 @@ public class DockerCustomCmdExecFactoryTestIT extends
DockerITTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
FakeDockerCmdExecFactory.class.getDeclaredConstructors();
return new RouteBuilder() {
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerITTestSupport.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerITTestSupport.java
index 1cda11f..7dd51cf 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerITTestSupport.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerITTestSupport.java
@@ -24,7 +24,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.docker.DockerComponent;
import org.apache.camel.component.docker.DockerConfiguration;
import org.apache.camel.support.PropertyBindingSupport;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
public class DockerITTestSupport extends CamelTestSupport {
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerNettyCmdExecFactoryTestIT.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerNettyCmdExecFactoryTestIT.java
index f3e8bfb..4dc2df9 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerNettyCmdExecFactoryTestIT.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerNettyCmdExecFactoryTestIT.java
@@ -21,12 +21,12 @@ import java.util.concurrent.TimeUnit;
import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
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 DockerNettyCmdExecFactoryTestIT extends DockerITTestSupport {
@Test
- public void testNettyCmdExecFactoryConfig() throws Exception {
+ void testNettyCmdExecFactoryConfig() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
@@ -36,7 +36,7 @@ public class DockerNettyCmdExecFactoryTestIT extends
DockerITTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:in")
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java
index 9865dc5..9ebea08 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java
@@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Integration test listing images on Docker Platform
@@ -28,7 +28,7 @@ import org.junit.Test;
public class DockerProducerTestIT extends DockerITTestSupport {
@Test
- public void testDocker() throws Exception {
+ void testDocker() throws Exception {
template.sendBody("direct:in", "");
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -38,7 +38,7 @@ public class DockerProducerTestIT extends DockerITTestSupport
{
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:in")
diff --git
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerStatsConsumerTestIT.java
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerStatsConsumerTestIT.java
index 0c7c531..e988c8f 100644
---
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerStatsConsumerTestIT.java
+++
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerStatsConsumerTestIT.java
@@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Integration test consuming statistics on Docker Platform
@@ -30,7 +30,7 @@ public class DockerStatsConsumerTestIT extends
DockerITTestSupport {
private static final String CONTAINER_ID = "470b9b823e6c";
@Test
- public void testDocker() throws Exception {
+ void testDocker() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
@@ -39,7 +39,7 @@ public class DockerStatsConsumerTestIT extends
DockerITTestSupport {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
fromF("docker://stats?containerId=%s", CONTAINER_ID)
