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-search/src | |
| 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-search/src')
2 files changed, 2 insertions, 2 deletions
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java index c6ab1a8454f..a60a1df8e40 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/SamplingTraceExporterTest.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/SamplingTraceExporterTest.java index b7dde90d28f..532385afe9e 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/SamplingTraceExporterTest.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/SamplingTraceExporterTest.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.streamingvisitors.tracing; import org.junit.Test; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; |