From ca0119950f8a986d3b531f665a2c6ce07881649d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 3 Apr 2019 14:39:29 +0100 Subject: [PATCH] Align with new fail-fast behaviour in Micrometer 1.1.4 Closes gh-16425 --- ...csMetricsExportAutoConfigurationTests.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java index 4b58930608..62d5d38cdb 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java @@ -48,7 +48,9 @@ public class AppOpticsMetricsExportAutoConfigurationTests { @Test public void autoConfiguresItsConfigAndMeterRegistry() { - this.contextRunner.withUserConfiguration(BaseConfiguration.class) + this.contextRunner + .withPropertyValues("management.metrics.export.appoptics.api-token=abcde") + .withUserConfiguration(BaseConfiguration.class) .run((context) -> assertThat(context) .hasSingleBean(AppOpticsMeterRegistry.class) .hasSingleBean(AppOpticsConfig.class)); @@ -73,7 +75,9 @@ public class AppOpticsMetricsExportAutoConfigurationTests { @Test public void allowsCustomRegistryToBeUsed() { - this.contextRunner.withUserConfiguration(CustomRegistryConfiguration.class) + this.contextRunner + .withPropertyValues("management.metrics.export.appoptics.api-token=abcde") + .withUserConfiguration(CustomRegistryConfiguration.class) .run((context) -> assertThat(context) .hasSingleBean(AppOpticsMeterRegistry.class) .hasBean("customRegistry").hasSingleBean(AppOpticsConfig.class)); @@ -81,8 +85,9 @@ public class AppOpticsMetricsExportAutoConfigurationTests { @Test public void stopsMeterRegistryWhenContextIsClosed() { - this.contextRunner.withUserConfiguration(BaseConfiguration.class) - .run((context) -> { + this.contextRunner + .withPropertyValues("management.metrics.export.appoptics.api-token=abcde") + .withUserConfiguration(BaseConfiguration.class).run((context) -> { AppOpticsMeterRegistry registry = context .getBean(AppOpticsMeterRegistry.class); assertThat(registry.isClosed()).isFalse(); @@ -107,7 +112,12 @@ public class AppOpticsMetricsExportAutoConfigurationTests { @Bean public AppOpticsConfig customConfig() { - return (key) -> null; + return (key) -> { + if ("appoptics.apiToken".equals(key)) { + return "abcde"; + } + return null; + }; } }