SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updates tests to use updated Mockito classes

Browse Source
This commit is contained in:
spencergibb
2021-10-14 12:18:40 -04:00
parent 8b96eab186
commit d3c595afbb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DiscoveredResourceUnitTests.java
View File

@@ -19,9 +19,8 @@ package org.springframework.cloud.client.hypermedia;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.hateoas.Link;
@@ -30,7 +29,8 @@ import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestOperations;
import static org.assertj.core.api.BDDAssertions.then;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -59,7 +59,7 @@ public class DiscoveredResourceUnitTests {
@Before
public void setUp() {
when(this.traversal.buildTraversal(Matchers.any(Traverson.class))).thenReturn(this.builder);
when(this.traversal.buildTraversal(any(Traverson.class))).thenReturn(this.builder);
this.resource = new DiscoveredResource(this.provider, this.traversal);
this.resource.setRestOperations(this.operations);
@@ -83,7 +83,7 @@ public class DiscoveredResourceUnitTests {
then(this.resource.getLink()).isEqualTo(link);
verify(this.provider, times(1)).getServiceInstance();
verify(this.traversal, times(1)).buildTraversal(Matchers.any(Traverson.class));
verify(this.traversal, times(1)).buildTraversal(any(Traverson.class));
}
@Test

4
spring-cloud-commons/src/test/java/org/springframework/cloud/client/hypermedia/DynamicServiceInstanceProviderUnitTests.java
View File

@@ -21,13 +21,13 @@ import java.util.Arrays;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import static org.assertj.core.api.BDDAssertions.then;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRequestFactoryTests.java
View File

@@ -33,7 +33,7 @@ import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpResponse;
import static org.assertj.core.api.BDDAssertions.then;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;