Skip to content

Micrometer tests flakiness - replace Mockito's when with doReturn #1709

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

Merged
merged 2 commits into from
Mar 21, 2021
Merged

Micrometer tests flakiness - replace Mockito's when with doReturn #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdb3cb4
Replace Mockito when with doReturn in Micrometer tests
eyalkoren Mar 21, 2021
8c1d4ff
Merge branch 'master' into micrometer-flaky-tests
eyalkoren Mar 21, 2021
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
6 changes: 3 additions & 3 deletions ...r-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerInstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.doReturn;

class MicrometerInstrumentationTest {

Expand All @@ -54,7 +54,7 @@ class MicrometerInstrumentationTest {
@BeforeEach
void setUp() {
config = SpyConfiguration.createSpyConfig();
when(config.getConfig(ReporterConfiguration.class).getMetricsIntervalMs()).thenReturn(50L);
doReturn(50L).when(config.getConfig(ReporterConfiguration.class)).getMetricsIntervalMs();
reporter = new MockReporter();
lastMeasuredMetricSetNumber = 0;
lastFooSamples = 0;
Expand All @@ -75,7 +75,7 @@ void testRegisterMeterRegistry() {

@Test
void testReportedWhenInstrumentConfigDisabled() {
when(config.getConfig(CoreConfiguration.class).isInstrument()).thenReturn(false);
doReturn(false).when(config.getConfig(CoreConfiguration.class)).isInstrument();
ElasticApmAgent.initInstrumentation(MockTracer.createRealTracer(reporter, config), ByteBuddyAgent.install());
SimpleMeterRegistry registry = new SimpleMeterRegistry();
registry.counter("foo").increment();
Expand Down
3 changes: 1 addition & 2 deletions ...r-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerMetricsReporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;


class MicrometerMetricsReporterTest {
Expand Down Expand Up @@ -133,7 +132,7 @@ void testDedotMetricName() {

@Test
void testDisableDedotMetricName() {
when(tracer.getConfig(MetricsConfiguration.class).isDedotCustomMetrics()).thenReturn(false);
doReturn(false).when(tracer.getConfig(MetricsConfiguration.class)).isDedotCustomMetrics();
meterRegistry.counter("foo.bar").increment(42);

JsonNode metricSet = getSingleMetricSet();
Expand Down