Skip to content

Commit aebf049

Browse files
committed
Merge pull request #14972 from dreis2211
* pr/14972: Fix MetricsAutoConfigurationTests
2 parents 621eb85 + fb03139 commit aebf049

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import java.util.List;
20-
2119
import io.micrometer.core.instrument.Clock;
2220
import io.micrometer.core.instrument.Meter;
2321
import io.micrometer.core.instrument.MeterRegistry;
@@ -36,7 +34,6 @@
3634

3735
import static org.assertj.core.api.Assertions.assertThat;
3836
import static org.mockito.Mockito.mock;
39-
import static org.mockito.Mockito.spy;
4037
import static org.mockito.Mockito.verify;
4138

4239
/**
@@ -68,13 +65,13 @@ public void configuresMeterRegistries() {
6865
this.contextRunner.withUserConfiguration(MeterRegistryConfiguration.class)
6966
.run((context) -> {
7067
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
71-
List<MeterFilter> filters = (List<MeterFilter>) ReflectionTestUtils
68+
MeterFilter[] filters = (MeterFilter[]) ReflectionTestUtils
7269
.getField(meterRegistry, "filters");
7370
assertThat(filters).hasSize(3);
74-
assertThat(filters.get(0).accept((Meter.Id) null))
71+
assertThat(filters[0].accept((Meter.Id) null))
7572
.isEqualTo(MeterFilterReply.DENY);
76-
assertThat(filters.get(1)).isInstanceOf(PropertiesMeterFilter.class);
77-
assertThat(filters.get(2).accept((Meter.Id) null))
73+
assertThat(filters[1]).isInstanceOf(PropertiesMeterFilter.class);
74+
assertThat(filters[2].accept((Meter.Id) null))
7875
.isEqualTo(MeterFilterReply.ACCEPT);
7976
verify((MeterBinder) context.getBean("meterBinder"))
8077
.bindTo(meterRegistry);
@@ -98,8 +95,7 @@ static class MeterRegistryConfiguration {
9895

9996
@Bean
10097
MeterRegistry meterRegistry() {
101-
SimpleMeterRegistry meterRegistry = new SimpleMeterRegistry();
102-
return spy(meterRegistry);
98+
return new SimpleMeterRegistry();
10399
}
104100

105101
@Bean

0 commit comments

Comments
 (0)