diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-18 15:19:59 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-18 15:19:59 +0200 |
commit | 579754fa5b5f4768a75fc3aed08f70ffb29db0e3 (patch) | |
tree | 825e5366b8253535bb9366722006ef49c6e83c53 /docker-api | |
parent | 19ab63311c9354db919a9a9ac38d34342e1ca204 (diff) |
Use mockito-core 3.1.0
Diffstat (limited to 'docker-api')
-rw-r--r-- | docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java | 4 | ||||
-rw-r--r-- | docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java index 412b8301e4c..04377f0b73c 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -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/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java index 4843d8f9685..2f84f84249b 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java @@ -17,7 +17,7 @@ import com.yahoo.config.provision.DockerImage; import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import java.util.OptionalLong; @@ -25,8 +25,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; 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; @@ -51,7 +51,7 @@ public class DockerImplTest { final ExecCreateCmd execCreateCmd = mock(ExecCreateCmd.class); when(dockerClient.execCreateCmd(any(String.class))).thenReturn(execCreateCmd); - when(execCreateCmd.withCmd(Matchers.<String>anyVararg())).thenReturn(execCreateCmd); + when(execCreateCmd.withCmd(ArgumentMatchers.<String>any())).thenReturn(execCreateCmd); when(execCreateCmd.withAttachStdout(any(Boolean.class))).thenReturn(execCreateCmd); when(execCreateCmd.withAttachStderr(any(Boolean.class))).thenReturn(execCreateCmd); when(execCreateCmd.withUser(any(String.class))).thenReturn(execCreateCmd); |