From bdb3cb4735064db792f2c9ea0bc4f2807fef39cf Mon Sep 17 00:00:00 2001
From: eyalkoren <41850454+eyalkoren@users.noreply.github.com>
Date: Sun, 21 Mar 2021 12:31:07 +0200
Subject: [PATCH] Replace Mockito when with doReturn in Micrometer tests

---
 .../apm/agent/micrometer/MicrometerInstrumentationTest.java | 6 +++---
 .../apm/agent/micrometer/MicrometerMetricsReporterTest.java | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apm-agent-plugins/apm-micrometer-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerInstrumentationTest.java b/apm-agent-plugins/apm-micrometer-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerInstrumentationTest.java
index f5f7acb44d..71a7bb5682 100644
--- a/apm-agent-plugins/apm-micrometer-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerInstrumentationTest.java
+++ b/apm-agent-plugins/apm-micrometer-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerInstrumentationTest.java
@@ -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 {
 
@@ -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;
@@ -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();
diff --git a/apm-agent-plugins/apm-micrometer-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerMetricsReporterTest.java b/apm-agent-plugins/apm-micrometer-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerMetricsReporterTest.java
index f645129c90..4b1cdaeed6 100644
--- a/apm-agent-plugins/apm-micrometer-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerMetricsReporterTest.java
+++ b/apm-agent-plugins/apm-micrometer-plugin/src/test/java/co/elastic/apm/agent/micrometer/MicrometerMetricsReporterTest.java
@@ -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 {
@@ -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();