diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-10-21 09:37:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-21 09:37:06 +0200 |
| commit | 1e9da543a5f9388efd9e4a43ee1fb661d0f76ce6 (patch) | |
| tree | 020396113785b69dc5c7f0338e790888df25a13d /container-disc | |
| parent | 1f0513a8f0f0d474a6cade2cd483af18ff55e0b9 (diff) | |
| parent | d1c56e768c02f9c4a34150c365a79a863b2303ab (diff) | |
Merge pull request #11020 from vespa-engine/hakonhall/use-mockito-core-310
Use mockito-core 3.1.0
Diffstat (limited to 'container-disc')
2 files changed, 4 insertions, 4 deletions
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; |