diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckConfigurationTest.java index 2543c3865ca..c3b475f4a62 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckConfigurationTest.java +++ b/core/camel-spring-boot/src/test/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/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java index b0c318dadf8..91ad6a4579c 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java +++ b/core/camel-spring-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/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java index 06a5b116a4b..12eb501cdbf 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java +++ b/core/camel-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"); } }