From 9eb4ecdb89d787d8f593c7df4aa132a99f905ee4 Mon Sep 17 00:00:00 2001 From: Sandesh <30489233+j-sandy@users.noreply.github.com> Date: Wed, 3 Jan 2024 00:42:40 +0530 Subject: [PATCH] refactor(test): replace deprecated mockito class Matchers with ArgumentMatchers and its methods during upgrade to spring boot 2.6.x (#6128) While upgrading spring boot 2.6.15, encounter similar errors as given below in multiple module of clouddriver (clouddriver-google, clouddriver-cloudfoundry, clouddriver-ecs) during test compilation: ``` > Task :clouddriver-google:compileTestGroovy FAILED /clouddriver/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverterTest.java:20: error: cannot find symbol import static org.mockito.Matchers.any; ^ symbol: class Matchers location: package org.mockito /clouddriver/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverterTest.java:20: error: static import only from classes and interfaces import static org.mockito.Matchers.any; ^ Note: /clouddriver/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/validators/SetStatefulDiskDescriptionValidatorTest.java uses or overrides a deprecated API. Note: Recompile with -Xlint:deprecation for details. 2 errors ``` Spring boot [2.6.15](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.15/spring-boot-dependencies-2.6.15.pom) brings mockito 4.0.0 as transitive dependency. The `Matchers` was deprecated in 3.x and now it is removed from mockito [4.0.0](https://github.com/mockito/mockito/releases/tag/v4.0.0). To fix these issues, replacing `Matchers` with `ArgumentMatchers` and its methods. --- .../cache/CacheRepositoryTest.java | 6 +- .../client/OrganizationsTest.java | 2 +- .../client/ServiceInstancesTest.java | 60 +++++++++++-------- .../cloudfoundry/client/ServiceKeysTest.java | 15 +++-- .../cloudfoundry/client/SpacesTest.java | 8 ++- ...udFoundryAtomicOperationConverterTest.java | 2 +- ...rverGroupAtomicOperationConverterTest.java | 2 +- ...BalancersAtomicOperationConverterTest.java | 2 +- ...erviceKeyAtomicOperationConverterTest.java | 2 +- ...erviceKeyAtomicOperationConverterTest.java | 2 +- ...rverGroupAtomicOperationConverterTest.java | 2 +- ...ryServiceAtomicOperationConverterTest.java | 2 +- ...rverGroupAtomicOperationConverterTest.java | 2 +- ...undryLoadBalancerMappingOperationTest.java | 4 +- ...loudFoundryServiceAtomicOperationTest.java | 4 +- ...loudFoundryServiceAtomicOperationTest.java | 2 +- ...FoundryServerGroupAtomicOperationTest.java | 2 +- ...loudFoundryServiceAtomicOperationTest.java | 10 ++-- ...FoundryServerGroupAtomicOperationTest.java | 2 +- ...FoundryServerGroupAtomicOperationTest.java | 2 +- ...FoundryServerGroupAtomicOperationTest.java | 4 +- ...UnmapLoadBalancersAtomicOperationTest.java | 11 ++-- ...loudFoundryServiceAtomicOperationTest.java | 10 ++-- ...oundryLoadBalancerAtomicOperationTest.java | 2 +- ...udFoundryLoadBalancerCachingAgentTest.java | 9 ++- ...oudFoundryServerGroupCachingAgentTest.java | 10 +++- .../provider/agent/CommonCachingAgent.java | 6 +- .../agent/ContainerInstanceCacheTest.java | 2 +- .../ContainerInstanceCachingAgentTest.java | 2 +- .../provider/agent/EcsClusterCacheTest.java | 2 +- .../agent/EcsClusterCachingAgentTest.java | 2 +- .../ecs/provider/agent/IamRoleCacheTest.java | 6 +- .../agent/IamRoleCachingAgentTest.java | 4 +- .../ecs/provider/agent/ServiceCacheTest.java | 2 +- .../agent/ServiceCachingAgentTest.java | 2 +- .../ecs/provider/agent/TaskCacheTest.java | 2 +- .../provider/agent/TaskCachingAgentTest.java | 2 +- .../agent/TaskDefinitionCacheTest.java | 2 +- .../agent/TaskDefinitionCachingAgentTest.java | 2 +- ...tefulDiskAtomicOperationConverterTest.java | 2 +- 40 files changed, 124 insertions(+), 93 deletions(-) diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepositoryTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepositoryTest.java index 46f8ac4f53b..c5fb3cf966c 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepositoryTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepositoryTest.java @@ -20,8 +20,8 @@ import static java.util.Collections.*; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyCollectionOf; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -129,7 +129,7 @@ void before() { when(apps.all(emptyList())).thenReturn(List.of(app, appWithoutInstances)); when(routes.all(emptyList())).thenReturn(emptyList()); when(providerCache.filterIdentifiers(any(), any())).thenReturn(emptyList()); - when(providerCache.getAll(any(), anyCollectionOf(String.class))).thenReturn(emptyList()); + when(providerCache.getAll(any(), anyCollection())).thenReturn(emptyList()); when(credentials.getName()).thenReturn("devaccount"); when(credentials.getClient()).thenReturn(client); diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/OrganizationsTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/OrganizationsTest.java index 1a6dcb44143..37ebff18130 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/OrganizationsTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/OrganizationsTest.java @@ -1,7 +1,7 @@ package com.netflix.spinnaker.clouddriver.cloudfoundry.client; import static org.assertj.core.api.Assertions.assertThat; -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/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceInstancesTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceInstancesTest.java index 7d0e804ed98..18c9e2b948a 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceInstancesTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceInstancesTest.java @@ -25,7 +25,15 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singleton; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.ConfigService; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.ServiceInstanceService; @@ -196,7 +204,7 @@ void shouldSuccessfullyCreateService() { when(serviceInstanceService.all(any(), any())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage()))); @@ -227,10 +235,10 @@ void shouldSuccessfullyCreateService() { @Test void shouldThrowExceptionWhenCreationReturnsHttpNotFound() { - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage()))); @@ -265,7 +273,7 @@ void throwExceptionWhenNoServicePlanExistsWithTheNameProvided() { servicePlansPageOne.setTotalResults(0); servicePlansPageOne.setTotalPages(1); servicePlansPageOne.setResources(Collections.emptyList()); - when(serviceInstanceService.findServicePlans(any(), anyListOf(String.class))) + when(serviceInstanceService.findServicePlans(any(), anyList())) .thenAnswer(invocation -> Calls.response(Response.success(servicePlansPageOne))); assertThrows( @@ -284,9 +292,9 @@ void throwExceptionWhenNoServicePlanExistsWithTheNameProvided() { @Test void shouldUpdateTheServiceIfAlreadyExists() { - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage()))); @@ -316,9 +324,9 @@ void shouldUpdateTheServiceIfAlreadyExists() { @Test void shouldNotUpdateTheServiceIfAlreadyExists() { - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage()))); @@ -348,9 +356,9 @@ void shouldNotUpdateTheServiceIfAlreadyExists() { @Test void shouldThrowExceptionIfServiceExistsAndNeedsChangingButUpdateFails() { - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage()))); @@ -394,9 +402,9 @@ void shouldThrowCloudFoundryApiErrorWhenMoreThanOneServiceInstanceWithTheSameNam serviceInstancePage.setResources( Arrays.asList(serviceInstanceResource, serviceInstanceResource)); - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer(invocation -> Calls.response(Response.success(serviceInstancePage))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage()))); @@ -420,7 +428,7 @@ void shouldSuccessfullyCreateUserProvidedService() { when(serviceInstanceService.all(any(), any())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage()))); @@ -454,7 +462,7 @@ void shouldUpdateUserProvidedServiceInstanceIfAlreadyExists() { when(serviceInstanceService.all(any(), any())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createUserProvidedServiceInstancePage()))); @@ -488,7 +496,7 @@ void shouldNotUpdateUserProvidedServiceInstanceIfAlreadyExists() { when(serviceInstanceService.all(any(), any())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createUserProvidedServiceInstancePage()))); @@ -1175,7 +1183,7 @@ void getOsbServiceInstanceShouldThrowExceptionWhenServiceNameIsBlank() { @Test void destroyServiceInstanceShouldSucceedWhenNoServiceBindingsExist() { - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage()))); when(serviceInstanceService.getBindingsForServiceInstance("service-instance-guid", null, null)) .thenAnswer(invocation -> Calls.response(Response.success(new Page<>()))); @@ -1191,7 +1199,7 @@ void destroyServiceInstanceShouldSucceedWhenNoServiceBindingsExist() { .setServiceInstanceName("new-service-instance-name") .setType(DELETE) .setState(IN_PROGRESS)); - verify(serviceInstanceService, times(1)).all(any(), anyListOf(String.class)); + verify(serviceInstanceService, times(1)).all(any(), anyList()); verify(serviceInstanceService, times(1)).destroyServiceInstance(any()); verify(serviceInstanceService, never()).allUserProvided(any(), any()); } @@ -1222,10 +1230,10 @@ void destroyServiceInstanceShouldThrowExceptionWhenDeleteServiceInstanceFails() @Test void destroyServiceInstanceShouldReturnSuccessWhenServiceInstanceDoesNotExist() { - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage()))); @@ -1244,7 +1252,7 @@ void destroyServiceInstanceShouldReturnSuccessWhenServiceInstanceDoesNotExist() @Test void destroyServiceInstanceShouldFailIfServiceBindingsExists() { - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage()))); when(serviceInstanceService.getBindingsForServiceInstance("service-instance-guid", null, null)) .thenReturn( @@ -1262,9 +1270,9 @@ void destroyServiceInstanceShouldFailIfServiceBindingsExists() { @Test void destroyUserProvidedServiceInstanceShouldSucceedWhenNoServiceBindingsExist() { - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer(invocation -> Calls.response(Response.success(new Page<>()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createUserProvidedServiceInstancePage()))); @@ -1283,7 +1291,7 @@ void destroyUserProvidedServiceInstanceShouldSucceedWhenNoServiceBindingsExist() .setServiceInstanceName("new-service-instance-name") .setType(DELETE) .setState(IN_PROGRESS)); - verify(serviceInstanceService, times(1)).all(any(), anyListOf(String.class)); + verify(serviceInstanceService, times(1)).all(any(), anyList()); verify(serviceInstanceService, times(1)).allUserProvided(any(), any()); verify(serviceInstanceService, times(1)).destroyUserProvidedServiceInstance(any()); verify(serviceInstanceService, times(1)) @@ -1297,9 +1305,9 @@ void destroyUserProvidedServiceInstanceShouldThrowExceptionWhenDeleteServiceInst serviceBindingPage.setTotalResults(0); serviceBindingPage.setTotalPages(1); - when(serviceInstanceService.all(any(), anyListOf(String.class))) + when(serviceInstanceService.all(any(), anyList())) .thenAnswer(invocation -> Calls.response(Response.success(new Page<>()))); - when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class))) + when(serviceInstanceService.allUserProvided(any(), anyList())) .thenAnswer( invocation -> Calls.response(Response.success(createUserProvidedServiceInstancePage()))); diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceKeysTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceKeysTest.java index 9dfbc9e150e..a3a674bad97 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceKeysTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceKeysTest.java @@ -23,10 +23,13 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.ServiceInstanceService; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.ServiceKeyService; @@ -70,13 +73,13 @@ class ServiceKeysTest { .toJavaMap(); { - when(serviceInstanceService.findService(any(), anyListOf(String.class))) + when(serviceInstanceService.findService(any(), anyList())) .thenReturn( Calls.response( Response.success( Page.singleton(new Service().setLabel("service1"), "service-guid")))); - when(serviceInstanceService.findServicePlans(any(), anyListOf(String.class))) + when(serviceInstanceService.findServicePlans(any(), anyList())) .thenReturn( Calls.response( Response.success( diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/SpacesTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/SpacesTest.java index 56e71c960b8..693492e657f 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/SpacesTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/SpacesTest.java @@ -2,8 +2,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.SpaceService; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.v2.Page; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractCloudFoundryAtomicOperationConverterTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractCloudFoundryAtomicOperationConverterTest.java index 953b90d1e56..f724d0223a3 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractCloudFoundryAtomicOperationConverterTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractCloudFoundryAtomicOperationConverterTest.java @@ -17,7 +17,7 @@ package com.netflix.spinnaker.clouddriver.cloudfoundry.deploy.converters; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryClient; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractCloudFoundryServerGroupAtomicOperationConverterTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractCloudFoundryServerGroupAtomicOperationConverterTest.java index 8bc53ef8a41..4e1ba9efbb9 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractCloudFoundryServerGroupAtomicOperationConverterTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractCloudFoundryServerGroupAtomicOperationConverterTest.java @@ -17,7 +17,7 @@ package com.netflix.spinnaker.clouddriver.cloudfoundry.deploy.converters; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryClient; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractLoadBalancersAtomicOperationConverterTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractLoadBalancersAtomicOperationConverterTest.java index 75c70890f7b..555ac615634 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractLoadBalancersAtomicOperationConverterTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/AbstractLoadBalancersAtomicOperationConverterTest.java @@ -19,7 +19,7 @@ import static java.util.Collections.emptyMap; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -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/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/CreateCloudFoundryServiceKeyAtomicOperationConverterTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/CreateCloudFoundryServiceKeyAtomicOperationConverterTest.java index f22d176213e..d20ea554e6c 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/CreateCloudFoundryServiceKeyAtomicOperationConverterTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/CreateCloudFoundryServiceKeyAtomicOperationConverterTest.java @@ -18,7 +18,7 @@ import static java.util.Collections.emptyMap; import static org.assertj.core.api.Assertions.assertThat; -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/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeleteCloudFoundryServiceKeyAtomicOperationConverterTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeleteCloudFoundryServiceKeyAtomicOperationConverterTest.java index 6cf436da989..e7c86242c58 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeleteCloudFoundryServiceKeyAtomicOperationConverterTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeleteCloudFoundryServiceKeyAtomicOperationConverterTest.java @@ -18,7 +18,7 @@ import static java.util.Collections.emptyMap; import static org.assertj.core.api.Assertions.assertThat; -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/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeployCloudFoundryServerGroupAtomicOperationConverterTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeployCloudFoundryServerGroupAtomicOperationConverterTest.java index 18b2e8acede..6630a3d0e5c 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeployCloudFoundryServerGroupAtomicOperationConverterTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeployCloudFoundryServerGroupAtomicOperationConverterTest.java @@ -19,7 +19,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static org.assertj.core.api.Assertions.assertThat; -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/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeployCloudFoundryServiceAtomicOperationConverterTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeployCloudFoundryServiceAtomicOperationConverterTest.java index c3463a7564a..51d14a70ac4 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeployCloudFoundryServiceAtomicOperationConverterTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/DeployCloudFoundryServiceAtomicOperationConverterTest.java @@ -19,7 +19,7 @@ import static java.util.Collections.emptyMap; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -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/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/ScaleCloudFoundryServerGroupAtomicOperationConverterTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/ScaleCloudFoundryServerGroupAtomicOperationConverterTest.java index 714cbb1c504..c62dbe56252 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/ScaleCloudFoundryServerGroupAtomicOperationConverterTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/converters/ScaleCloudFoundryServerGroupAtomicOperationConverterTest.java @@ -18,7 +18,7 @@ import static java.util.Collections.emptyMap; import static org.assertj.core.api.Assertions.assertThat; -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/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/AbstractCloudFoundryLoadBalancerMappingOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/AbstractCloudFoundryLoadBalancerMappingOperationTest.java index 941c6433ddc..6c605a1f179 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/AbstractCloudFoundryLoadBalancerMappingOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/AbstractCloudFoundryLoadBalancerMappingOperationTest.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.Index.atIndex; -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.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryApiException; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServiceAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServiceAtomicOperationTest.java index f498e55f372..a808144d48b 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServiceAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServiceAtomicOperationTest.java @@ -22,8 +22,8 @@ import static com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.v2.LastOperation.Type.UPDATE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.ServiceInstanceResponse; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DestroyCloudFoundryServiceAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DestroyCloudFoundryServiceAtomicOperationTest.java index 7c50225eb94..d898ad4b358 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DestroyCloudFoundryServiceAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DestroyCloudFoundryServiceAtomicOperationTest.java @@ -22,7 +22,7 @@ import static com.netflix.spinnaker.clouddriver.cloudfoundry.utils.TestUtils.assertThrows; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.ServiceInstanceResponse; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/ScaleCloudFoundryServerGroupAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/ScaleCloudFoundryServerGroupAtomicOperationTest.java index fc070e67f16..0354279ac02 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/ScaleCloudFoundryServerGroupAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/ScaleCloudFoundryServerGroupAtomicOperationTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/ShareCloudFoundryServiceAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/ShareCloudFoundryServiceAtomicOperationTest.java index 8e6a544da3c..5eeb85ce931 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/ShareCloudFoundryServiceAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/ShareCloudFoundryServiceAtomicOperationTest.java @@ -20,10 +20,12 @@ import static com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.v2.LastOperation.Type.SHARE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.matches; -import static org.mockito.Matchers.same; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.matches; +import static org.mockito.ArgumentMatchers.same; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryApiException; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.ServiceInstanceResponse; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/StartCloudFoundryServerGroupAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/StartCloudFoundryServerGroupAtomicOperationTest.java index faeab354369..eaa9b6f5dc6 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/StartCloudFoundryServerGroupAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/StartCloudFoundryServerGroupAtomicOperationTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -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/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/StopCloudFoundryServerGroupAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/StopCloudFoundryServerGroupAtomicOperationTest.java index 3dc3eaa4803..84f266af6bf 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/StopCloudFoundryServerGroupAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/StopCloudFoundryServerGroupAtomicOperationTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -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/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/TerminateCloudFoundryServerGroupAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/TerminateCloudFoundryServerGroupAtomicOperationTest.java index 156174bfb29..0b52f894e37 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/TerminateCloudFoundryServerGroupAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/TerminateCloudFoundryServerGroupAtomicOperationTest.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UnmapLoadBalancersAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UnmapLoadBalancersAtomicOperationTest.java index fd267748a71..b7562552b91 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UnmapLoadBalancersAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UnmapLoadBalancersAtomicOperationTest.java @@ -18,10 +18,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.matches; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.matches; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryApiException; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.Routes; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UnshareCloudFoundryServiceAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UnshareCloudFoundryServiceAtomicOperationTest.java index d01a3a7eb02..9384d0aa5fe 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UnshareCloudFoundryServiceAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UnshareCloudFoundryServiceAtomicOperationTest.java @@ -20,10 +20,12 @@ import static com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.v2.LastOperation.Type.UNSHARE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.matches; -import static org.mockito.Matchers.same; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.matches; +import static org.mockito.ArgumentMatchers.same; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryApiException; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.ServiceInstanceResponse; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UpsertCloudFoundryLoadBalancerAtomicOperationTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UpsertCloudFoundryLoadBalancerAtomicOperationTest.java index ba3fc2518e4..fa538d8880f 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UpsertCloudFoundryLoadBalancerAtomicOperationTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/UpsertCloudFoundryLoadBalancerAtomicOperationTest.java @@ -17,7 +17,7 @@ package com.netflix.spinnaker.clouddriver.cloudfoundry.deploy.ops; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryApiException; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/provider/agent/CloudFoundryLoadBalancerCachingAgentTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/provider/agent/CloudFoundryLoadBalancerCachingAgentTest.java index ac61e5b5e9f..355d6b44388 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/provider/agent/CloudFoundryLoadBalancerCachingAgentTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/provider/agent/CloudFoundryLoadBalancerCachingAgentTest.java @@ -4,9 +4,12 @@ import static com.netflix.spinnaker.clouddriver.cloudfoundry.provider.agent.CloudFoundryServerGroupCachingAgent.cacheView; import static java.util.Collections.*; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyCollection; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.MapperFeature; diff --git a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/provider/agent/CloudFoundryServerGroupCachingAgentTest.java b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/provider/agent/CloudFoundryServerGroupCachingAgentTest.java index afe24838174..b1aea5da92f 100644 --- a/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/provider/agent/CloudFoundryServerGroupCachingAgentTest.java +++ b/clouddriver-cloudfoundry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/provider/agent/CloudFoundryServerGroupCachingAgentTest.java @@ -4,9 +4,13 @@ import static com.netflix.spinnaker.clouddriver.cloudfoundry.provider.agent.CloudFoundryServerGroupCachingAgent.cacheView; import static java.util.Collections.*; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyCollection; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.refEq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/CommonCachingAgent.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/CommonCachingAgent.java index fd6d08c8326..5c2c58f7081 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/CommonCachingAgent.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/CommonCachingAgent.java @@ -16,9 +16,9 @@ package com.netflix.spinnaker.clouddriver.ecs.provider.agent; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ContainerInstanceCacheTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ContainerInstanceCacheTest.java index e68c919dd08..8f505b2baf9 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ContainerInstanceCacheTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ContainerInstanceCacheTest.java @@ -18,7 +18,7 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.CONTAINER_INSTANCES; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.ContainerInstance; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ContainerInstanceCachingAgentTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ContainerInstanceCachingAgentTest.java index 002882c3add..8e18b954d06 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ContainerInstanceCachingAgentTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ContainerInstanceCachingAgentTest.java @@ -18,7 +18,7 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.CONTAINER_INSTANCES; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.ContainerInstance; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/EcsClusterCacheTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/EcsClusterCacheTest.java index df6ea5cba08..4b059db9773 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/EcsClusterCacheTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/EcsClusterCacheTest.java @@ -18,7 +18,7 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.ECS_CLUSTERS; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.ListClustersRequest; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/EcsClusterCachingAgentTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/EcsClusterCachingAgentTest.java index 2f481994df2..3b81e597079 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/EcsClusterCachingAgentTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/EcsClusterCachingAgentTest.java @@ -18,7 +18,7 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.ECS_CLUSTERS; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.ListClustersRequest; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/IamRoleCacheTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/IamRoleCacheTest.java index ce4b7b3b8cf..20962aa846d 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/IamRoleCacheTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/IamRoleCacheTest.java @@ -18,9 +18,9 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.IAM_ROLE; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/IamRoleCachingAgentTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/IamRoleCachingAgentTest.java index b21443227f6..7ad124f5ac2 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/IamRoleCachingAgentTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/IamRoleCachingAgentTest.java @@ -19,7 +19,9 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.IAM_ROLE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ServiceCacheTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ServiceCacheTest.java index b7a9702f2f0..2a73d4e5b9f 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ServiceCacheTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ServiceCacheTest.java @@ -18,7 +18,7 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.SERVICES; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.*; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ServiceCachingAgentTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ServiceCachingAgentTest.java index 2eca0c649b5..d1481b40923 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ServiceCachingAgentTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/ServiceCachingAgentTest.java @@ -19,7 +19,7 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.ECS_CLUSTERS; import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.SERVICES; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.DeploymentConfiguration; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskCacheTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskCacheTest.java index 53e317823dd..c3b15787dc8 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskCacheTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskCacheTest.java @@ -18,7 +18,7 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.TASKS; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.DescribeTasksRequest; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskCachingAgentTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskCachingAgentTest.java index 86071caaf54..cc64a8cd4e7 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskCachingAgentTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskCachingAgentTest.java @@ -19,7 +19,7 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.ECS_CLUSTERS; import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.TASKS; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.DescribeTasksRequest; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCacheTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCacheTest.java index 16ed6e8f100..1640f18d883 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCacheTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCacheTest.java @@ -20,8 +20,8 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.TASK_DEFINITIONS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.*; diff --git a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCachingAgentTest.java b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCachingAgentTest.java index ba14eea4e7e..9d742507ed2 100644 --- a/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCachingAgentTest.java +++ b/clouddriver-ecs/src/test/java/com/netflix/spinnaker/clouddriver/ecs/provider/agent/TaskDefinitionCachingAgentTest.java @@ -20,8 +20,8 @@ import static com.netflix.spinnaker.clouddriver.ecs.cache.Keys.Namespace.TASK_DEFINITIONS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; import com.amazonaws.services.ecs.model.DescribeTaskDefinitionRequest; diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverterTest.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverterTest.java index 7eed8f878e5..664b3aeb914 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverterTest.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverterTest.java @@ -17,7 +17,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy.converters; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when;