Skip to content

Fix MetricsAutoConfigurationTests #14972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix MetricsAutoConfigurationTests #14972

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84f08f8
Fix MetricsAutoConfigurationTests
dreis2211 Oct 26, 2018
917d550
Polish MetricsAutoConfigurationTests
dreis2211 Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions ...org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

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

import java.util.List;

import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
Expand All @@ -36,7 +34,6 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;

/**
Expand Down Expand Up @@ -68,13 +65,13 @@ public void configuresMeterRegistries() {
this.contextRunner.withUserConfiguration(MeterRegistryConfiguration.class)
.run((context) -> {
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
List<MeterFilter> filters = (List<MeterFilter>) ReflectionTestUtils
MeterFilter[] filters = (MeterFilter[]) ReflectionTestUtils
.getField(meterRegistry, "filters");
assertThat(filters).hasSize(3);
assertThat(filters.get(0).accept((Meter.Id) null))
assertThat(filters[0].accept((Meter.Id) null))
.isEqualTo(MeterFilterReply.DENY);
assertThat(filters.get(1)).isInstanceOf(PropertiesMeterFilter.class);
assertThat(filters.get(2).accept((Meter.Id) null))
assertThat(filters[1]).isInstanceOf(PropertiesMeterFilter.class);
assertThat(filters[2].accept((Meter.Id) null))
.isEqualTo(MeterFilterReply.ACCEPT);
verify((MeterBinder) context.getBean("meterBinder"))
.bindTo(meterRegistry);
Expand All @@ -98,8 +95,7 @@ static class MeterRegistryConfiguration {

@Bean
MeterRegistry meterRegistry() {
SimpleMeterRegistry meterRegistry = new SimpleMeterRegistry();
return spy(meterRegistry);
return new SimpleMeterRegistry();
}

@Bean
Expand Down