CAMEL-17436: Disabling health check for single route or consumer is n…

…ot possible (#428)
apache · Jan 5, 2022 · 2cb8306 · 2cb8306
1 parent f7f7ae6
commit 2cb8306
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/...t/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckConfigurationTest.java b/...t/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckConfigurationTest.java
@@ -29,10 +29,12 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 
 @CamelSpringBootTest
 @EnableAutoConfiguration
 @SpringBootApplication
+@DirtiesContext
 @SpringBootTest(
     classes = {CamelAutoConfiguration.class, CamelHealthCheckAutoConfiguration.class, DownRoute.class, MyCamelRoute.class},
     properties = {"camel.health.config[consumer\\:down-route].parent=consumers",
@@ -67,7 +69,7 @@ void shouldNotDisableAllConsumersHealthChecks() {
             .get()
             .matches(hc -> !hc.getConfiguration().isEnabled());
 
-        assertThat(registry.getCheck("consumer:route1"))
+        assertThat(registry.getCheck("consumer:foo-route"))
             .as("other route health check is enabled")
             .isPresent()
             .get()

diff --git a/...pring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java b/...pring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java
@@ -26,12 +26,14 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 
 @CamelSpringBootTest
 @EnableAutoConfiguration
 @SpringBootApplication
 @SpringBootTest(
-    classes = {CamelAutoConfiguration.class, CamelHealthCheckAutoConfiguration.class, MyCamelRoute.class})
+    classes = {CamelAutoConfiguration.class, CamelHealthCheckAutoConfiguration.class, MyCamelRoute.class},
+    properties = {"camel.springboot.java-routes-include-pattern=**/MyCamelRoute*"})
 public class CamelHealthTest {
 
     @Autowired

diff --git a/...l-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java b/...l-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java
@@ -24,6 +24,6 @@ public class MyCamelRoute extends RouteBuilder {
 
     @Override
     public void configure() throws Exception {
-        from("timer:foo").to("log:foo");
+        from("timer:foo").routeId("foo-route").to("log:foo");
     }
 }