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 --- flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java | 4 ++-- flags/src/test/java/com/yahoo/vespa/flags/OrderedFlagSourceTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'flags/src') diff --git a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java index 750f0f414f9..0f486794c3a 100644 --- a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java +++ b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java @@ -17,8 +17,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; 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.times; import static org.mockito.Mockito.verify; diff --git a/flags/src/test/java/com/yahoo/vespa/flags/OrderedFlagSourceTest.java b/flags/src/test/java/com/yahoo/vespa/flags/OrderedFlagSourceTest.java index 5465f89e2eb..b30f217f79c 100644 --- a/flags/src/test/java/com/yahoo/vespa/flags/OrderedFlagSourceTest.java +++ b/flags/src/test/java/com/yahoo/vespa/flags/OrderedFlagSourceTest.java @@ -7,7 +7,7 @@ import java.util.Optional; import static org.junit.Assert.assertEquals; 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; -- cgit v1.2.3