Browse Source

Address comments

Signed-off-by: Vasily Pelikh <2010720+vasilypelikh@users.noreply.github.com>
pull/47442/head
Vasily Pelikh 2 months ago
parent
commit
159000756f
  1. 12
      module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/logging/LoggingMetricsExportAutoConfigurationTests.java
  2. 4
      module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/logging/LoggingMetricsExportPropertiesConfigAdapterTests.java

12
module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/logging/LoggingMetricsExportAutoConfigurationTests.java

@ -22,6 +22,7 @@ import io.micrometer.core.instrument.logging.LoggingRegistryConfig; @@ -22,6 +22,7 @@ import io.micrometer.core.instrument.logging.LoggingRegistryConfig;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -41,7 +42,16 @@ class LoggingMetricsExportAutoConfigurationTests { @@ -41,7 +42,16 @@ class LoggingMetricsExportAutoConfigurationTests {
@Test
void backsOffWithoutAClock() {
this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(LoggingMeterRegistry.class));
this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(LoggingMeterRegistry.class)
.doesNotHaveBean(LoggingRegistryConfig.class));
}
@Test
void backOffWhenLoggingMeterRegistryIsMissing() {
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
.withClassLoader(new FilteredClassLoader(LoggingMeterRegistry.class))
.run((context) -> assertThat(context).doesNotHaveBean(LoggingMeterRegistry.class)
.doesNotHaveBean(LoggingRegistryConfig.class));
}
@Test

4
module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/logging/LoggingMetricsExportPropertiesConfigAdapterTests.java

@ -36,12 +36,12 @@ class LoggingMetricsExportPropertiesConfigAdapterTests { @@ -36,12 +36,12 @@ class LoggingMetricsExportPropertiesConfigAdapterTests {
}
@Test
void whenPropertiesAggregationTemporalityIsNotSetAdapterAggregationTemporalityReturnsCumulative() {
void whenPropertiesLogInactiveIsNotSetAdapterLogInactiveReturnsFalse() {
assertThat(createAdapter().logInactive()).isFalse();
}
@Test
void whenPropertiesAggregationTemporalityIsSetAdapterAggregationTemporalityReturnsIt() {
void whenPropertiesLogInactiveIsSetAdapterLogInactiveReturnsIt() {
this.properties.setLogInactive(true);
assertThat(createAdapter().logInactive()).isTrue();
}

Loading…
Cancel
Save