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 /configserver | |
| 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 'configserver')
2 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java index 32fe6ab82b5..4cccafef266 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java @@ -15,7 +15,7 @@ import java.net.URL; import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java index 41db57ab1e0..da576c88b52 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java @@ -46,8 +46,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; |