From 579754fa5b5f4768a75fc3aed08f70ffb29db0e3 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 18 Oct 2019 15:19:59 +0200 Subject: Use mockito-core 3.1.0 --- .../yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java | 4 ++-- .../test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'container-disc') diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java index fbe92e97e9b..6a669d9f7f9 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java @@ -11,8 +11,8 @@ import java.util.LinkedList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java index 25d5b7b9886..c491a0d5ff5 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java @@ -8,8 +8,8 @@ import org.junit.Test; import java.lang.management.ManagementFactory; import java.time.Duration; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -- cgit v1.2.3