diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java index 732bbf50bec..94a8f065ece 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java @@ -114,15 +114,6 @@ public class EndpointDiscovererTests { load(TestEndpointConfiguration.class, this::hasTestEndpoint); } - @Test - public void getEndpointsWhenHasProxiedEndpointShouldReturnEndpoint() { - load(ProxiedSpecializedEndpointsConfiguration.class, (context) -> { - SpecializedEndpointDiscoverer discoverer = new SpecializedEndpointDiscoverer(context); - Map endpoints = mapEndpoints(discoverer.getEndpoints()); - assertThat(endpoints).containsOnlyKeys(EndpointId.of("test"), EndpointId.of("specialized")); - }); - } - @Test public void getEndpointsWhenHasEndpointInParentContextShouldReturnEndpoint() { AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext( @@ -247,6 +238,15 @@ public class EndpointDiscovererTests { }); } + @Test + public void getEndpointsWhenHasProxiedEndpointShouldReturnEndpoint() { + load(ProxiedSpecializedEndpointsConfiguration.class, (context) -> { + SpecializedEndpointDiscoverer discoverer = new SpecializedEndpointDiscoverer(context); + Map endpoints = mapEndpoints(discoverer.getEndpoints()); + assertThat(endpoints).containsOnlyKeys(EndpointId.of("test"), EndpointId.of("specialized")); + }); + } + @Test public void getEndpointsShouldApplyFilters() { load(SpecializedEndpointsConfiguration.class, (context) -> { @@ -401,11 +401,6 @@ public class EndpointDiscovererTests { } - @Import({ TestEndpoint.class, ProxiedSpecializedTestEndpointConfiguration.class, SpecializedTestEndpoint.class }) - static class ProxiedSpecializedEndpointsConfiguration { - - } - @Import({ TestEndpoint.class, SpecializedTestEndpoint.class, SpecializedExtension.class }) static class SpecializedEndpointsConfiguration { @@ -416,6 +411,11 @@ public class EndpointDiscovererTests { } + @Import({ TestEndpoint.class, SpecializedTestEndpoint.class, ProxiedSpecializedTestEndpointConfiguration.class }) + static class ProxiedSpecializedEndpointsConfiguration { + + } + @Endpoint(id = "test") static class TestEndpoint {