This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-13965 by this push:
new a8b896d CAMEL-14037: Migrated camel-consul to
camel-testcontainers-junit5
a8b896d is described below
commit a8b896dfd4c59ae61b37a71e41e92832f9b8679a
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Sat Oct 5 17:26:40 2019 +0200
CAMEL-14037: Migrated camel-consul to camel-testcontainers-junit5
---
components/camel-consul/pom.xml | 10 ++++++++++
.../camel/component/consul/ConsulCatalogTest.java | 16 ++++++++--------
.../component/consul/ConsulClientKeyValueTest.java | 5 ++++-
.../component/consul/ConsulCoordinatesTest.java | 20 ++++++++++----------
.../camel/component/consul/ConsulEventTest.java | 6 +++++-
.../component/consul/ConsulEventWatchTest.java | 2 +-
.../camel/component/consul/ConsulHealthTest.java | 12 +++++++-----
.../camel/component/consul/ConsulKeyValueTest.java | 5 ++++-
.../component/consul/ConsulKeyValueWatchTest.java | 2 +-
.../camel/component/consul/ConsulRegistryTest.java | 21 +++++++++++----------
.../component/consul/ConsulRegistryUtilsTest.java | 6 +++---
.../camel/component/consul/ConsulSessionTest.java | 18 +++++++++---------
.../camel/component/consul/ConsulTestSupport.java | 11 +++--------
.../cloud/ConsulDefaultServiceCallRouteTest.java | 2 +-
.../cloud/ConsulRibbonServiceCallRouteTest.java | 2 +-
.../ConsulServiceCallWithRegistrationTest.java | 10 ++++++----
.../consul/cloud/ConsulServiceDiscoveryTest.java | 5 ++++-
.../cloud/ConsulServiceRegistrationTestBase.java | 5 ++++-
.../consul/cloud/ConsulServiceRegistryTest.java | 4 +++-
.../apache/camel/test/junit5/CamelTestSupport.java | 7 +++++++
20 files changed, 102 insertions(+), 67 deletions(-)
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index c17d1a4..65eef4f 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -55,6 +55,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-testcontainers-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogTest.java
index d96305b..097daec 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCatalogTest.java
@@ -21,8 +21,8 @@ import java.util.List;
import com.orbitz.consul.model.health.Node;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulCatalogActions;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class ConsulCatalogTest extends ConsulTestSupport {
@@ -34,9 +34,9 @@ public class ConsulCatalogTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertFalse(ref.isEmpty());
- Assert.assertFalse(res.isEmpty());
- Assert.assertEquals(ref, res);
+ Assertions.assertFalse(ref.isEmpty());
+ Assertions.assertFalse(res.isEmpty());
+ Assertions.assertEquals(ref, res);
}
@Test
@@ -47,9 +47,9 @@ public class ConsulCatalogTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertFalse(ref.isEmpty());
- Assert.assertFalse(res.isEmpty());
- Assert.assertEquals(ref, res);
+ Assertions.assertFalse(ref.isEmpty());
+ Assertions.assertFalse(res.isEmpty());
+ Assertions.assertEquals(ref, res);
}
@Override
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
index ef6cc27..749c22f 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulKeyValueActions;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsulClientKeyValueTest extends ConsulTestSupport {
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesTest.java
index 1b9d280..fc8a855 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulCoordinatesTest.java
@@ -22,9 +22,9 @@ import com.orbitz.consul.model.coordinate.Coordinate;
import com.orbitz.consul.model.coordinate.Datacenter;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulCoordinatesActions;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class ConsulCoordinatesTest extends ConsulTestSupport {
@@ -36,12 +36,12 @@ public class ConsulCoordinatesTest extends
ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertFalse(ref.isEmpty());
- Assert.assertFalse(res.isEmpty());
- Assert.assertEquals(ref, res);
+ Assertions.assertFalse(ref.isEmpty());
+ Assertions.assertFalse(res.isEmpty());
+ Assertions.assertEquals(ref, res);
}
- @Ignore("Disabled as it seems that nodes is always 0")
+ @Disabled("Disabled as it seems that nodes is always 0")
@Test
public void testNodes() throws Exception {
List<Coordinate> ref = getConsul().coordinateClient().getNodes();
@@ -50,9 +50,9 @@ public class ConsulCoordinatesTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertFalse(ref.isEmpty());
- Assert.assertFalse(res.isEmpty());
- Assert.assertEquals(ref, res);
+ Assertions.assertFalse(ref.isEmpty());
+ Assertions.assertFalse(res.isEmpty());
+ Assertions.assertEquals(ref, res);
}
@Override
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java
index 6daed84..c2f4d51 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java
@@ -23,7 +23,11 @@ import com.orbitz.consul.model.event.Event;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulEventActions;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsulEventTest extends ConsulTestSupport {
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
index 8550295..b546e1c 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import com.orbitz.consul.EventClient;
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 ConsulEventWatchTest extends ConsulTestSupport {
private String key;
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthTest.java
index 79e2cfe..2f6c9ef 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulHealthTest.java
@@ -27,8 +27,10 @@ import com.orbitz.consul.model.agent.Registration;
import com.orbitz.consul.model.health.ServiceHealth;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulHealthActions;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsulHealthTest extends ConsulTestSupport {
private AgentClient client;
@@ -85,9 +87,9 @@ public class ConsulHealthTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertEquals(2, ref.size());
- Assert.assertEquals(2, res.size());
- Assert.assertEquals(ref, res);
+ Assertions.assertEquals(2, ref.size());
+ Assertions.assertEquals(2, res.size());
+ Assertions.assertEquals(ref, res);
assertTrue(registrations.stream().anyMatch(
r -> r.getPort().isPresent() && r.getPort().get() ==
res.get(0).getService().getPort() &&
r.getId().equalsIgnoreCase(res.get(0).getService().getId())
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java
index dc03889..6c96fc4 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java
@@ -21,7 +21,10 @@ import java.util.Optional;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulKeyValueActions;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsulKeyValueTest extends ConsulTestSupport {
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java
index 716e25e..7dcfab9 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java
@@ -22,7 +22,7 @@ import java.util.Random;
import com.orbitz.consul.KeyValueClient;
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 ConsulKeyValueWatchTest extends ConsulTestSupport {
private String key;
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
index 67cc2fd..a6fa6a7 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
@@ -23,14 +23,15 @@ import java.util.Set;
import com.orbitz.consul.Consul;
import org.apache.camel.NoSuchBeanException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Unit test for Camel Registry implementation for Consul
@@ -49,7 +50,7 @@ public class ConsulRegistryTest implements Serializable {
}
}
- @BeforeClass
+ @BeforeAll
public static void setUp() {
container = ConsulTestSupport.consulContainer();
container.start();
@@ -57,7 +58,7 @@ public class ConsulRegistryTest implements Serializable {
registry = new ConsulRegistry(container.getContainerIpAddress(),
container.getMappedPort(Consul.DEFAULT_HTTP_PORT));
}
- @AfterClass
+ @AfterAll
public static void tearDown() {
container.stop();
}
@@ -165,8 +166,8 @@ public class ConsulRegistryTest implements Serializable {
}
- @Test(expected = NoSuchBeanException.class)
+ @Test
public void deleteNonExisting() {
- registry.remove("nonExisting");
+ assertThrows(NoSuchBeanException.class, () ->
registry.remove("nonExisting"));
}
}
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryUtilsTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryUtilsTest.java
index f56045d..221e569 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryUtilsTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryUtilsTest.java
@@ -21,10 +21,10 @@ import java.util.Arrays;
import java.util.List;
import org.apache.camel.component.consul.ConsulRegistry.ConsulRegistryUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author <a href="https://github.com/ppalaga";>Peter Palaga</a>
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionTest.java
index 63fa765..300feaa 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulSessionTest.java
@@ -24,8 +24,8 @@ import com.orbitz.consul.model.session.SessionCreatedResponse;
import com.orbitz.consul.model.session.SessionInfo;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.endpoint.ConsulSessionActions;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class ConsulSessionTest extends ConsulTestSupport {
@@ -40,8 +40,8 @@ public class ConsulSessionTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertEquals(sessions, list.size());
- Assert.assertFalse(list.stream().anyMatch(s ->
s.getName().isPresent() && s.getName().get().equals(name)));
+ Assertions.assertEquals(sessions, list.size());
+ Assertions.assertFalse(list.stream().anyMatch(s ->
s.getName().isPresent() && s.getName().get().equals(name)));
}
SessionCreatedResponse res = fluentTemplate()
@@ -50,7 +50,7 @@ public class ConsulSessionTest extends ConsulTestSupport {
.to("direct:consul")
.request(SessionCreatedResponse.class);
- Assert.assertNotNull(res.getId());
+ Assertions.assertNotNull(res.getId());
{
List<SessionInfo> list = fluentTemplate()
@@ -58,8 +58,8 @@ public class ConsulSessionTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertEquals(sessions + 1, list.size());
- Assert.assertTrue(list.stream().anyMatch(s ->
s.getName().isPresent() && s.getName().get().equals(name)));
+ Assertions.assertEquals(sessions + 1, list.size());
+ Assertions.assertTrue(list.stream().anyMatch(s ->
s.getName().isPresent() && s.getName().get().equals(name)));
}
{
@@ -74,8 +74,8 @@ public class ConsulSessionTest extends ConsulTestSupport {
.to("direct:consul")
.request(List.class);
- Assert.assertEquals(sessions, list.size());
- Assert.assertFalse(list.stream().anyMatch(s ->
s.getName().isPresent() && s.getName().get().equals(name)));
+ Assertions.assertEquals(sessions, list.size());
+ Assertions.assertFalse(list.stream().anyMatch(s ->
s.getName().isPresent() && s.getName().get().equals(name)));
}
}
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
index 5dff0b3..2fecc6d 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
@@ -24,10 +24,8 @@ import com.orbitz.consul.Consul;
import com.orbitz.consul.KeyValueClient;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
-import org.apache.camel.test.testcontainers.Wait;
-import org.junit.Rule;
-import org.junit.rules.TestName;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
public class ConsulTestSupport extends ContainerAwareTestSupport {
@@ -35,9 +33,6 @@ public class ConsulTestSupport extends
ContainerAwareTestSupport {
public static final String CONTAINER_NAME = "consul";
public static final String KV_PREFIX = "/camel";
- @Rule
- public final TestName testName = new TestName();
-
@BindToRegistry("consul")
public ConsulComponent getConsulComponent() {
ConsulComponent component = new ConsulComponent();
@@ -69,7 +64,7 @@ public class ConsulTestSupport extends
ContainerAwareTestSupport {
}
protected String generateKey() {
- return KV_PREFIX + "/" + testName.getMethodName() + "/" +
generateRandomString();
+ return KV_PREFIX + "/" + getCurrentTestName() + "/" +
generateRandomString();
}
protected String consulUrl() {
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
index c21ed04..1f054d0 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulDefaultServiceCallRouteTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsulDefaultServiceCallRouteTest extends ConsulTestSupport {
private static final String SERVICE_NAME = "http-service";
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
index eb7c769..ec26483 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulRibbonServiceCallRouteTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ConsulRibbonServiceCallRouteTest extends ConsulTestSupport {
private static final String SERVICE_NAME = "http-service";
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
index e7f6a80..506fcfd 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationTest.java
@@ -23,9 +23,12 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.impl.cloud.ServiceRegistrationRoutePolicy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.util.SocketUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class ConsulServiceCallWithRegistrationTest extends ConsulTestSupport {
private static final String SERVICE_HOST = "localhost";
@@ -93,7 +96,7 @@ public class ConsulServiceCallWithRegistrationTest extends
ConsulTestSupport {
assertEquals("ping on " + port, template.requestBody("direct:start",
"ping", String.class));
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testServiceCallFailure() throws Exception {
final int port = SocketUtils.findAvailableTcpPort();
final String serviceId = UUID.randomUUID().toString();
@@ -126,7 +129,6 @@ public class ConsulServiceCallWithRegistrationTest extends
ConsulTestSupport {
context.start();
- template.requestBody("direct:start", "ping", String.class);
- fail("Should have failed");
+ assertThrows(CamelExecutionException.class, () ->
template.requestBody("direct:start", "ping", String.class));
}
}
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
index 8023c29..d0277e8 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryTest.java
@@ -29,9 +29,12 @@ import org.apache.camel.cloud.ServiceDiscovery;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.util.SocketUtils;
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ConsulServiceDiscoveryTest extends ConsulTestSupport {
private AgentClient client;
private List<Registration> registrations;
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
index b9a3bed..231cf88 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
@@ -28,9 +28,12 @@ import com.orbitz.consul.model.health.ServiceHealth;
import org.apache.camel.CamelContext;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.consul.ConsulTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.util.SocketUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public abstract class ConsulServiceRegistrationTestBase extends
ConsulTestSupport {
protected static final String SERVICE_ID = UUID.randomUUID().toString();
protected static final String SERVICE_NAME = "my-service";
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryTest.java
index 2c7f574..b4e0df0 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistryTest.java
@@ -24,7 +24,9 @@ import com.orbitz.consul.model.catalog.CatalogService;
import com.orbitz.consul.model.health.ServiceHealth;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.impl.cloud.DefaultServiceDefinition;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ConsulServiceRegistryTest extends ConsulTestSupport {
@Override
diff --git
a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 31b45c5..3b74fbb 100644
---
a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++
b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -295,6 +295,13 @@ public abstract class CamelTestSupport implements
BeforeEachCallback, AfterAllCa
}
/**
+ * Gets the name of the current test being executed.
+ */
+ public final String getCurrentTestName() {
+ return currentTestName;
+ }
+
+ /**
* Override to enable debugger
* <p/>
* Is default <tt>false</tt>
