This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b7710a14d33b044599227ff9285682376d15f5d1
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 9 17:36:57 2020 +0200
[CAMEL-11807] Upgrade camel-health to junit5
---
core/camel-health/pom.xml | 4 +-
.../health/DefaultHealthCheckRegistryTest.java | 81 ++++++++++++----------
.../apache/camel/impl/health/HealthCheckTest.java | 62 +++++++++--------
.../impl/health/ReadinessAndLivenessTest.java | 29 ++++----
.../camel/impl/health/RouteHealthCheckTest.java | 2 +-
5 files changed, 95 insertions(+), 83 deletions(-)
diff --git a/core/camel-health/pom.xml b/core/camel-health/pom.xml
index ec2478c..348ed58 100644
--- a/core/camel-health/pom.xml
+++ b/core/camel-health/pom.xml
@@ -78,8 +78,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java
b/core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java
index ff25a59..8963c2d 100644
---
a/core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java
+++
b/core/camel-health/src/test/java/org/apache/camel/impl/health/DefaultHealthCheckRegistryTest.java
@@ -28,8 +28,13 @@ import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.health.HealthCheckResultBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class DefaultHealthCheckRegistryTest {
@@ -46,14 +51,14 @@ public class DefaultHealthCheckRegistryTest {
registry.register(new MyHealthCheck("G2", "3"));
List<HealthCheck> checks =
registry.stream().collect(Collectors.toList());
- Assert.assertEquals(3, checks.size());
+ assertEquals(3, checks.size());
for (HealthCheck check : checks) {
HealthCheck.Result response = check.call();
- Assert.assertEquals(HealthCheck.State.UP, response.getState());
- Assert.assertFalse(response.getMessage().isPresent());
- Assert.assertFalse(response.getError().isPresent());
+ assertEquals(HealthCheck.State.UP, response.getState());
+ assertFalse(response.getMessage().isPresent());
+ assertFalse(response.getError().isPresent());
}
}
@@ -72,15 +77,15 @@ public class DefaultHealthCheckRegistryTest {
registry.start();
List<HealthCheck> checks =
registry.stream().collect(Collectors.toList());
- Assert.assertEquals(3, checks.size());
+ assertEquals(3, checks.size());
for (HealthCheck check : checks) {
HealthCheck.Result response = check.call();
- Assert.assertEquals(HealthCheck.State.UP, response.getState());
- Assert.assertFalse(response.getMessage().isPresent());
- Assert.assertFalse(response.getError().isPresent());
- Assert.assertSame(context, ((CamelContextAware)
check).getCamelContext());
+ assertEquals(HealthCheck.State.UP, response.getState());
+ assertFalse(response.getMessage().isPresent());
+ assertFalse(response.getError().isPresent());
+ assertSame(context, ((CamelContextAware) check).getCamelContext());
}
}
@@ -99,15 +104,15 @@ public class DefaultHealthCheckRegistryTest {
registry.start();
List<HealthCheck> checks =
registry.stream().collect(Collectors.toList());
- Assert.assertEquals(3, checks.size());
+ assertEquals(3, checks.size());
for (HealthCheck check : checks) {
HealthCheck.Result response = check.call();
- Assert.assertEquals(HealthCheck.State.UP, response.getState());
- Assert.assertFalse(response.getMessage().isPresent());
- Assert.assertFalse(response.getError().isPresent());
- Assert.assertSame(context, ((CamelContextAware)
check).getCamelContext());
+ assertEquals(HealthCheck.State.UP, response.getState());
+ assertFalse(response.getMessage().isPresent());
+ assertFalse(response.getError().isPresent());
+ assertSame(context, ((CamelContextAware) check).getCamelContext());
}
}
@@ -118,10 +123,10 @@ public class DefaultHealthCheckRegistryTest {
HealthCheckRegistry registry = new DefaultHealthCheckRegistry();
registry.setCamelContext(context);
HealthCheck hc = (HealthCheck) registry.resolveById("context");
- Assert.assertNotNull(hc);
- Assert.assertEquals("camel", hc.getGroup());
- Assert.assertEquals("context", hc.getId());
- Assert.assertTrue(hc instanceof ContextHealthCheck);
+ assertNotNull(hc);
+ assertEquals("camel", hc.getGroup());
+ assertEquals("context", hc.getId());
+ assertTrue(hc instanceof ContextHealthCheck);
registry.register(hc);
registry.register(new MyHealthCheck("G1", "1"));
@@ -132,15 +137,15 @@ public class DefaultHealthCheckRegistryTest {
registry.start();
List<HealthCheck> checks =
registry.stream().collect(Collectors.toList());
- Assert.assertEquals(4, checks.size());
+ assertEquals(4, checks.size());
for (HealthCheck check : checks) {
HealthCheck.Result response = check.call();
- Assert.assertEquals(HealthCheck.State.UP, response.getState());
- Assert.assertFalse(response.getMessage().isPresent());
- Assert.assertFalse(response.getError().isPresent());
- Assert.assertSame(context, ((CamelContextAware)
check).getCamelContext());
+ assertEquals(HealthCheck.State.UP, response.getState());
+ assertFalse(response.getMessage().isPresent());
+ assertFalse(response.getError().isPresent());
+ assertSame(context, ((CamelContextAware) check).getCamelContext());
}
}
@@ -151,9 +156,9 @@ public class DefaultHealthCheckRegistryTest {
HealthCheckRegistry registry = new DefaultHealthCheckRegistry();
registry.setCamelContext(context);
HealthCheckRepository hc = (HealthCheckRepository)
registry.resolveById("routes");
- Assert.assertNotNull(hc);
- Assert.assertEquals("routes", hc.getId());
- Assert.assertTrue(hc instanceof RoutesHealthCheckRepository);
+ assertNotNull(hc);
+ assertEquals("routes", hc.getId());
+ assertTrue(hc instanceof RoutesHealthCheckRepository);
registry.register(hc);
context.addRoutes(new RouteBuilder() {
@@ -168,14 +173,14 @@ public class DefaultHealthCheckRegistryTest {
registry.start();
List<HealthCheck> checks =
registry.stream().collect(Collectors.toList());
- Assert.assertEquals(2, checks.size());
+ assertEquals(2, checks.size());
for (HealthCheck check : checks) {
HealthCheck.Result response = check.call();
- Assert.assertEquals(HealthCheck.State.UP, response.getState());
- Assert.assertFalse(response.getMessage().isPresent());
- Assert.assertFalse(response.getError().isPresent());
+ assertEquals(HealthCheck.State.UP, response.getState());
+ assertFalse(response.getMessage().isPresent());
+ assertFalse(response.getError().isPresent());
}
context.getRouteController().stopRoute("foo");
@@ -184,13 +189,13 @@ public class DefaultHealthCheckRegistryTest {
HealthCheck.Result response = check.call();
boolean foo = "foo".equals(response.getDetails().get("route.id"));
if (foo) {
- Assert.assertEquals(HealthCheck.State.DOWN,
response.getState());
- Assert.assertTrue(response.getMessage().isPresent());
- Assert.assertFalse(response.getError().isPresent());
+ assertEquals(HealthCheck.State.DOWN, response.getState());
+ assertTrue(response.getMessage().isPresent());
+ assertFalse(response.getError().isPresent());
} else {
- Assert.assertEquals(HealthCheck.State.UP, response.getState());
- Assert.assertFalse(response.getMessage().isPresent());
- Assert.assertFalse(response.getError().isPresent());
+ assertEquals(HealthCheck.State.UP, response.getState());
+ assertFalse(response.getMessage().isPresent());
+ assertFalse(response.getError().isPresent());
}
}
}
diff --git
a/core/camel-health/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
b/core/camel-health/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
index 495be85..ef2a41a 100644
---
a/core/camel-health/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
+++
b/core/camel-health/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
@@ -21,8 +21,12 @@ import java.util.Map;
import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckResultBuilder;
-import org.junit.Assert;
-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.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class HealthCheckTest {
@@ -37,18 +41,18 @@ public class HealthCheckTest {
result = check.call();
- Assert.assertEquals(HealthCheck.State.UNKNOWN, result.getState());
- Assert.assertTrue(result.getMessage().isPresent());
- Assert.assertEquals("Disabled", result.getMessage().get());
- Assert.assertEquals(false,
result.getDetails().get(AbstractHealthCheck.CHECK_ENABLED));
+ assertEquals(HealthCheck.State.UNKNOWN, result.getState());
+ assertTrue(result.getMessage().isPresent());
+ assertEquals("Disabled", result.getMessage().get());
+ assertEquals(false,
result.getDetails().get(AbstractHealthCheck.CHECK_ENABLED));
check.getConfiguration().setEnabled(true);
result = check.call();
- Assert.assertEquals(HealthCheck.State.UP, result.getState());
- Assert.assertFalse(result.getMessage().isPresent());
-
Assert.assertFalse(result.getDetails().containsKey(AbstractHealthCheck.CHECK_ENABLED));
+ assertEquals(HealthCheck.State.UP, result.getState());
+ assertFalse(result.getMessage().isPresent());
+
assertFalse(result.getDetails().containsKey(AbstractHealthCheck.CHECK_ENABLED));
}
@Test
@@ -59,23 +63,23 @@ public class HealthCheckTest {
check.getConfiguration().setInterval(1000);
HealthCheck.Result result1 = check.call();
- Assert.assertEquals(HealthCheck.State.UP, result1.getState());
+ assertEquals(HealthCheck.State.UP, result1.getState());
Thread.sleep(100);
HealthCheck.Result result2 = check.call();
- Assert.assertEquals(HealthCheck.State.UP, result2.getState());
-
Assert.assertEquals(result1.getDetails().get(AbstractHealthCheck.INVOCATION_TIME),
result2.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
-
Assert.assertEquals(result1.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT),
result2.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
-
Assert.assertNotEquals(check.getMetaData().get(AbstractHealthCheck.INVOCATION_ATTEMPT_TIME),
result2.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
+ assertEquals(HealthCheck.State.UP, result2.getState());
+
assertEquals(result1.getDetails().get(AbstractHealthCheck.INVOCATION_TIME),
result2.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
+
assertEquals(result1.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT),
result2.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
+
assertNotEquals(check.getMetaData().get(AbstractHealthCheck.INVOCATION_ATTEMPT_TIME),
result2.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
Thread.sleep(1250);
HealthCheck.Result result3 = check.call();
- Assert.assertEquals(HealthCheck.State.UP, result3.getState());
-
Assert.assertNotEquals(result2.getDetails().get(AbstractHealthCheck.INVOCATION_TIME),
result3.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
-
Assert.assertNotEquals(result2.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT),
result3.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
-
Assert.assertEquals(check.getMetaData().get(AbstractHealthCheck.INVOCATION_ATTEMPT_TIME),
result3.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
+ assertEquals(HealthCheck.State.UP, result3.getState());
+
assertNotEquals(result2.getDetails().get(AbstractHealthCheck.INVOCATION_TIME),
result3.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
+
assertNotEquals(result2.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT),
result3.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
+
assertEquals(check.getMetaData().get(AbstractHealthCheck.INVOCATION_ATTEMPT_TIME),
result3.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
}
@Test
@@ -90,12 +94,12 @@ public class HealthCheckTest {
for (int i = 0; i < check.getConfiguration().getFailureThreshold();
i++) {
result = check.call();
- Assert.assertEquals(HealthCheck.State.UP, result.getState());
- Assert.assertEquals(i + 1,
result.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
- Assert.assertEquals(i + 1,
result.getDetails().get(AbstractHealthCheck.FAILURE_COUNT));
+ assertEquals(HealthCheck.State.UP, result.getState());
+ assertEquals(i + 1,
result.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
+ assertEquals(i + 1,
result.getDetails().get(AbstractHealthCheck.FAILURE_COUNT));
}
- Assert.assertEquals(HealthCheck.State.DOWN, check.call().getState());
+ assertEquals(HealthCheck.State.DOWN, check.call().getState());
}
@Test
@@ -116,20 +120,20 @@ public class HealthCheckTest {
icount =
(int)result.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT);
fcount =
(int)result.getDetails().get(AbstractHealthCheck.FAILURE_COUNT);
- Assert.assertEquals(HealthCheck.State.UP, result.getState());
- Assert.assertEquals(i + 1, icount);
- Assert.assertEquals(i + 1, fcount);
+ assertEquals(HealthCheck.State.UP, result.getState());
+ assertEquals(i + 1, icount);
+ assertEquals(i + 1, fcount);
result = check.call();
- Assert.assertEquals(HealthCheck.State.UP, result.getState());
- Assert.assertEquals(icount,
result.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
- Assert.assertEquals(fcount,
result.getDetails().get(AbstractHealthCheck.FAILURE_COUNT));
+ assertEquals(HealthCheck.State.UP, result.getState());
+ assertEquals(icount,
result.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
+ assertEquals(fcount,
result.getDetails().get(AbstractHealthCheck.FAILURE_COUNT));
Thread.sleep(550);
}
- Assert.assertEquals(HealthCheck.State.DOWN, check.call().getState());
+ assertEquals(HealthCheck.State.DOWN, check.call().getState());
}
// ********************************
diff --git
a/core/camel-health/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
b/core/camel-health/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
index 836bd1b..88e5c6a 100644
---
a/core/camel-health/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
+++
b/core/camel-health/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
@@ -28,8 +28,11 @@ import org.apache.camel.health.HealthCheckHelper;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckResultBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-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 ReadinessAndLivenessTest {
@@ -47,23 +50,23 @@ public class ReadinessAndLivenessTest {
registry.start();
List<HealthCheck> checks =
registry.stream().collect(Collectors.toList());
- Assert.assertEquals(2, checks.size());
+ assertEquals(2, checks.size());
Collection<HealthCheck.Result> results =
HealthCheckHelper.invokeReadiness(context);
- Assert.assertEquals(1, results.size());
+ assertEquals(1, results.size());
HealthCheck.Result result = results.iterator().next();
- Assert.assertEquals(HealthCheck.State.UP, result.getState());
- Assert.assertFalse(result.getCheck().isLiveness());
- Assert.assertTrue(result.getCheck().isReadiness());
- Assert.assertTrue(result.getCheck() instanceof MyReadyCheck);
+ assertEquals(HealthCheck.State.UP, result.getState());
+ assertFalse(result.getCheck().isLiveness());
+ assertTrue(result.getCheck().isReadiness());
+ assertTrue(result.getCheck() instanceof MyReadyCheck);
results = HealthCheckHelper.invokeLiveness(context);
- Assert.assertEquals(1, results.size());
+ assertEquals(1, results.size());
result = results.iterator().next();
- Assert.assertEquals(HealthCheck.State.DOWN, result.getState());
- Assert.assertTrue(result.getCheck().isLiveness());
- Assert.assertFalse(result.getCheck().isReadiness());
- Assert.assertTrue(result.getCheck() instanceof MyLiveCheck);
+ assertEquals(HealthCheck.State.DOWN, result.getState());
+ assertTrue(result.getCheck().isLiveness());
+ assertFalse(result.getCheck().isReadiness());
+ assertTrue(result.getCheck() instanceof MyLiveCheck);
}
private class MyReadyCheck extends AbstractHealthCheck implements
CamelContextAware {
diff --git
a/core/camel-health/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
b/core/camel-health/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
index c869f07..bbf07e8 100644
---
a/core/camel-health/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
+++
b/core/camel-health/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Route;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.health.HealthCheckResultBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class RouteHealthCheckTest {
