Skip to content

Commit 8ecdf91

Browse files
dreis2211snicoll
dreis2211
authored and
snicoll
committed
Fix Mockito deprecations
See spring-projectsgh-18689
1 parent 511a2a0 commit 8ecdf91

File tree

19 files changed

+47
-47
lines changed

19 files changed

+47
-47
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryConfigurerTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import static org.mockito.Mockito.inOrder;
3939
import static org.mockito.Mockito.mock;
4040
import static org.mockito.Mockito.verify;
41-
import static org.mockito.Mockito.verifyZeroInteractions;
41+
import static org.mockito.Mockito.verifyNoInteractions;
4242

4343
/**
4444
* Tests for {@link MeterRegistryConfigurer}.
@@ -128,7 +128,7 @@ void configureShouldNotApplyBinderWhenCompositeExists() {
128128
MeterRegistryConfigurer configurer = new MeterRegistryConfigurer(createObjectProvider(this.customizers),
129129
createObjectProvider(this.filters), createObjectProvider(this.binders), false, true);
130130
configurer.configure(this.mockRegistry);
131-
verifyZeroInteractions(this.mockBinder);
131+
verifyNoInteractions(this.mockBinder);
132132
}
133133

134134
@Test

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapperTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import static org.mockito.BDDMockito.given;
3636
import static org.mockito.Mockito.mock;
3737
import static org.mockito.Mockito.verify;
38-
import static org.mockito.Mockito.verifyZeroInteractions;
38+
import static org.mockito.Mockito.verifyNoInteractions;
3939

4040
/**
4141
* Tests for {@link HealthWebEndpointResponseMapper}.
@@ -56,8 +56,8 @@ void mapDetailsWithDisableDetailsDoesNotInvokeSupplier() {
5656
SecurityContext securityContext = mock(SecurityContext.class);
5757
WebEndpointResponse<Health> response = mapper.mapDetails(supplier, securityContext);
5858
assertThat(response.getStatus()).isEqualTo(HttpStatus.NOT_FOUND.value());
59-
verifyZeroInteractions(supplier);
60-
verifyZeroInteractions(securityContext);
59+
verifyNoInteractions(supplier);
60+
verifyNoInteractions(securityContext);
6161
}
6262

6363
@Test
@@ -68,7 +68,7 @@ void mapDetailsWithUnauthorizedUserDoesNotInvokeSupplier() {
6868
WebEndpointResponse<Health> response = mapper.mapDetails(supplier, securityContext);
6969
assertThat(response.getStatus()).isEqualTo(HttpStatus.NOT_FOUND.value());
7070
assertThat(response.getBody()).isNull();
71-
verifyZeroInteractions(supplier);
71+
verifyNoInteractions(supplier);
7272
verify(securityContext).isUserInRole("ACTUATOR");
7373
}
7474

@@ -94,7 +94,7 @@ void mapDetailsWithUnavailableHealth() {
9494
assertThat(response.getStatus()).isEqualTo(HttpStatus.NOT_FOUND.value());
9595
assertThat(response.getBody()).isNull();
9696
verify(supplier).get();
97-
verifyZeroInteractions(securityContext);
97+
verifyNoInteractions(securityContext);
9898
}
9999

100100
@SuppressWarnings("unchecked")

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import static org.mockito.BDDMockito.given;
4646
import static org.mockito.Mockito.mock;
4747
import static org.mockito.Mockito.verify;
48-
import static org.mockito.Mockito.verifyZeroInteractions;
48+
import static org.mockito.Mockito.verifyNoInteractions;
4949

5050
/**
5151
* Integration tests for {@link LoggersEndpoint} when exposed via Jersey, Spring MVC, and
@@ -165,7 +165,7 @@ void setLoggerOrLoggerGroupWithWrongLogLevelResultInBadRequestResponse() {
165165
this.client.post().uri("/actuator/loggers/ROOT").contentType(MediaType.APPLICATION_JSON)
166166
.bodyValue(Collections.singletonMap("configuredLevel", "other")).exchange().expectStatus()
167167
.isBadRequest();
168-
verifyZeroInteractions(this.loggingSystem);
168+
verifyNoInteractions(this.loggingSystem);
169169
}
170170

171171
@WebEndpointTest

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusPushGatewayManagerTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import static org.mockito.Mockito.mock;
4545
import static org.mockito.Mockito.never;
4646
import static org.mockito.Mockito.verify;
47-
import static org.mockito.Mockito.verifyZeroInteractions;
47+
import static org.mockito.Mockito.verifyNoInteractions;
4848

4949
/**
5050
* Tests for {@link PrometheusPushGatewayManager}.
@@ -162,7 +162,7 @@ void shutdownWhenShutdownOperationIsNoneDoesNothing() {
162162
this.scheduler, this.pushRate, "job", this.groupingKey, ShutdownOperation.NONE);
163163
manager.shutdown();
164164
verify(this.future).cancel(false);
165-
verifyZeroInteractions(this.pushGateway);
165+
verifyNoInteractions(this.pushGateway);
166166
}
167167

168168
@Test

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.springframework.util.ClassUtils;
4141

4242
import static org.assertj.core.api.Assertions.assertThat;
43-
import static org.mockito.Mockito.verifyZeroInteractions;
43+
import static org.mockito.Mockito.verifyNoInteractions;
4444

4545
/**
4646
* Tests for {@link ImportAutoConfigurationImportSelector}.
@@ -83,7 +83,7 @@ void importsAreSelectedUsingClassesAttribute() throws Exception {
8383
void propertyExclusionsAreNotApplied() throws Exception {
8484
AnnotationMetadata annotationMetadata = getAnnotationMetadata(ImportFreeMarker.class);
8585
this.importSelector.selectImports(annotationMetadata);
86-
verifyZeroInteractions(this.environment);
86+
verifyNoInteractions(this.environment);
8787
}
8888

8989
@Test

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
import static org.assertj.core.api.Assertions.assertThat;
6969
import static org.mockito.Mockito.mock;
70-
import static org.mockito.Mockito.verifyZeroInteractions;
70+
import static org.mockito.Mockito.verifyNoInteractions;
7171

7272
/**
7373
* Tests for {@link QuartzAutoConfiguration}.
@@ -157,7 +157,7 @@ void withTaskExecutor() {
157157
Scheduler scheduler = context.getBean(Scheduler.class);
158158
assertThat(scheduler.getMetaData().getThreadPoolSize()).isEqualTo(50);
159159
Executor executor = context.getBean(Executor.class);
160-
verifyZeroInteractions(executor);
160+
verifyNoInteractions(executor);
161161
});
162162
}
163163

‎spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherFilterTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import static org.mockito.BDDMockito.willReturn;
4343
import static org.mockito.Mockito.mock;
4444
import static org.mockito.Mockito.verify;
45-
import static org.mockito.Mockito.verifyZeroInteractions;
45+
import static org.mockito.Mockito.verifyNoInteractions;
4646

4747
/**
4848
* Tests for {@link DispatcherFilter}.
@@ -82,7 +82,7 @@ void ignoresNotServletRequests() throws Exception {
8282
ServletRequest request = mock(ServletRequest.class);
8383
ServletResponse response = mock(ServletResponse.class);
8484
this.filter.doFilter(request, response, this.chain);
85-
verifyZeroInteractions(this.dispatcher);
85+
verifyNoInteractions(this.dispatcher);
8686
verify(this.chain).doFilter(request, response);
8787
}
8888

@@ -100,7 +100,7 @@ void handledByDispatcher() throws Exception {
100100
HttpServletResponse response = new MockHttpServletResponse();
101101
willReturn(true).given(this.dispatcher).handle(any(ServerHttpRequest.class), any(ServerHttpResponse.class));
102102
this.filter.doFilter(request, response, this.chain);
103-
verifyZeroInteractions(this.chain);
103+
verifyNoInteractions(this.chain);
104104
verify(this.dispatcher).handle(this.serverRequestCaptor.capture(), this.serverResponseCaptor.capture());
105105
ServerHttpRequest dispatcherRequest = this.serverRequestCaptor.getValue();
106106
ServletServerHttpRequest actualRequest = (ServletServerHttpRequest) dispatcherRequest;

‎spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import static org.mockito.Mockito.inOrder;
4242
import static org.mockito.Mockito.mock;
4343
import static org.mockito.Mockito.verify;
44-
import static org.mockito.Mockito.verifyZeroInteractions;
44+
import static org.mockito.Mockito.verifyNoInteractions;
4545
import static org.mockito.Mockito.withSettings;
4646

4747
/**
@@ -91,7 +91,7 @@ void accessManagerVetoRequest() throws Exception {
9191
given(mapper.getHandler(any(ServerHttpRequest.class))).willReturn(handler);
9292
Dispatcher dispatcher = new Dispatcher(this.accessManager, Collections.singleton(mapper));
9393
dispatcher.handle(this.serverRequest, this.serverResponse);
94-
verifyZeroInteractions(handler);
94+
verifyNoInteractions(handler);
9595
assertThat(this.response.getStatus()).isEqualTo(403);
9696
}
9797

‎spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestarterTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import static org.mockito.ArgumentMatchers.any;
4848
import static org.mockito.BDDMockito.given;
4949
import static org.mockito.Mockito.mock;
50-
import static org.mockito.Mockito.verifyZeroInteractions;
50+
import static org.mockito.Mockito.verifyNoInteractions;
5151

5252
/**
5353
* Tests for {@link Restarter}.
@@ -136,7 +136,7 @@ void getOrAddAttributeWithExistingAttribute() {
136136
ObjectFactory objectFactory = mock(ObjectFactory.class);
137137
Object attribute = Restarter.getInstance().getOrAddAttribute("x", objectFactory);
138138
assertThat(attribute).isEqualTo("abc");
139-
verifyZeroInteractions(objectFactory);
139+
verifyNoInteractions(objectFactory);
140140
}
141141

142142
@Test

‎spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import static org.assertj.core.api.Assertions.assertThat;
3939
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
4040
import static org.mockito.Mockito.verify;
41-
import static org.mockito.Mockito.verifyZeroInteractions;
41+
import static org.mockito.Mockito.verifyNoInteractions;
4242

4343
/**
4444
* Tests for {@link HttpRestartServer}.
@@ -92,7 +92,7 @@ void sendNoContent() throws Exception {
9292
MockHttpServletRequest request = new MockHttpServletRequest();
9393
MockHttpServletResponse response = new MockHttpServletResponse();
9494
this.server.handle(new ServletServerHttpRequest(request), new ServletServerHttpResponse(response));
95-
verifyZeroInteractions(this.delegate);
95+
verifyNoInteractions(this.delegate);
9696
assertThat(response.getStatus()).isEqualTo(500);
9797

9898
}
@@ -103,7 +103,7 @@ void sendBadData() throws Exception {
103103
MockHttpServletResponse response = new MockHttpServletResponse();
104104
request.setContent(new byte[] { 0, 0, 0 });
105105
this.server.handle(new ServletServerHttpRequest(request), new ServletServerHttpResponse(response));
106-
verifyZeroInteractions(this.delegate);
106+
verifyNoInteractions(this.delegate);
107107
assertThat(response.getStatus()).isEqualTo(500);
108108
}
109109

‎spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3434
import static org.mockito.BDDMockito.given;
3535
import static org.mockito.Mockito.mock;
36-
import static org.mockito.Mockito.verifyZeroInteractions;
36+
import static org.mockito.Mockito.verifyNoInteractions;
3737

3838
/**
3939
* Tests for {@link PropertyMappingContextCustomizerFactory}.
@@ -53,7 +53,7 @@ void getContextCustomizerWhenHasNoMappingShouldNotAddPropertySource() {
5353
given(context.getEnvironment()).willReturn(environment);
5454
given(context.getBeanFactory()).willReturn(beanFactory);
5555
customizer.customizeContext(context, null);
56-
verifyZeroInteractions(environment);
56+
verifyNoInteractions(environment);
5757
}
5858

5959
@Test

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringBootExceptionHandlerTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import static org.mockito.Mockito.mock;
2525
import static org.mockito.Mockito.verify;
26-
import static org.mockito.Mockito.verifyZeroInteractions;
26+
import static org.mockito.Mockito.verifyNoInteractions;
2727

2828
/**
2929
* Tests for {@link SpringBootExceptionHandler}.
@@ -43,7 +43,7 @@ void uncaughtExceptionDoesNotForwardLoggedErrorToParent() {
4343
Exception ex = new Exception();
4444
this.handler.registerLoggedException(ex);
4545
this.handler.uncaughtException(thread, ex);
46-
verifyZeroInteractions(this.parent);
46+
verifyNoInteractions(this.parent);
4747
}
4848

4949
@Test

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindResultTests.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
3434
import static org.mockito.BDDMockito.given;
3535
import static org.mockito.Mockito.verify;
36-
import static org.mockito.Mockito.verifyZeroInteractions;
36+
import static org.mockito.Mockito.verifyNoInteractions;
3737

3838
/**
3939
* Tests for {@link BindResult}.
@@ -100,7 +100,7 @@ void ifBoundWhenHasValueShouldCallConsumer() {
100100
void ifBoundWhenHasNoValueShouldNotCallConsumer() {
101101
BindResult<String> result = BindResult.of(null);
102102
result.ifBound(this.consumer);
103-
verifyZeroInteractions(this.consumer);
103+
verifyNoInteractions(this.consumer);
104104
}
105105

106106
@Test
@@ -121,7 +121,7 @@ void mapWhenHasValueShouldCallMapper() {
121121
void mapWhenHasNoValueShouldNotCallMapper() {
122122
BindResult<String> result = BindResult.of(null);
123123
result.map(this.mapper);
124-
verifyZeroInteractions(this.mapper);
124+
verifyNoInteractions(this.mapper);
125125
}
126126

127127
@Test
@@ -140,7 +140,7 @@ void orElseWhenHasValueNoShouldReturnOther() {
140140
void orElseGetWhenHasValueShouldReturnValue() {
141141
BindResult<String> result = BindResult.of("foo");
142142
assertThat(result.orElseGet(this.supplier)).isEqualTo("foo");
143-
verifyZeroInteractions(this.supplier);
143+
verifyNoInteractions(this.supplier);
144144
}
145145

146146
@Test

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/DeferredLogTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import static org.assertj.core.api.Assertions.assertThat;
2727
import static org.mockito.Mockito.mock;
2828
import static org.mockito.Mockito.verify;
29+
import static org.mockito.Mockito.verifyNoInteractions;
2930
import static org.mockito.Mockito.verifyNoMoreInteractions;
30-
import static org.mockito.Mockito.verifyZeroInteractions;
3131

3232
/**
3333
* Tests for {@link DeferredLog}.
@@ -168,7 +168,7 @@ void clearsOnReplayTo() {
168168
verify(this.log).info("1", null);
169169
verify(this.log).fatal("2", null);
170170
verifyNoMoreInteractions(this.log);
171-
verifyZeroInteractions(log2);
171+
verifyNoInteractions(log2);
172172
}
173173

174174
@SuppressWarnings("unchecked")

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskExecutorBuilderTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import static org.mockito.Mockito.mock;
3232
import static org.mockito.Mockito.spy;
3333
import static org.mockito.Mockito.verify;
34-
import static org.mockito.Mockito.verifyZeroInteractions;
34+
import static org.mockito.Mockito.verifyNoInteractions;
3535

3636
/**
3737
* Tests for {@link TaskExecutorBuilder}.
@@ -125,7 +125,7 @@ void customizersShouldReplaceExisting() {
125125
TaskExecutorCustomizer customizer2 = mock(TaskExecutorCustomizer.class);
126126
ThreadPoolTaskExecutor executor = this.builder.customizers(customizer1)
127127
.customizers(Collections.singleton(customizer2)).build();
128-
verifyZeroInteractions(customizer1);
128+
verifyNoInteractions(customizer1);
129129
verify(customizer2).customize(executor);
130130
}
131131

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/task/TaskSchedulerBuilderTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import static org.mockito.Mockito.mock;
3030
import static org.mockito.Mockito.spy;
3131
import static org.mockito.Mockito.verify;
32-
import static org.mockito.Mockito.verifyZeroInteractions;
32+
import static org.mockito.Mockito.verifyNoInteractions;
3333

3434
/**
3535
* Tests for {@link TaskSchedulerBuilder}.
@@ -101,7 +101,7 @@ void customizersShouldReplaceExisting() {
101101
TaskSchedulerCustomizer customizer2 = mock(TaskSchedulerCustomizer.class);
102102
ThreadPoolTaskScheduler scheduler = this.builder.customizers(customizer1)
103103
.customizers(Collections.singleton(customizer2)).build();
104-
verifyZeroInteractions(customizer1);
104+
verifyNoInteractions(customizer1);
105105
verify(customizer2).customize(scheduler);
106106
}
107107

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/util/LambdaSafeTests.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import static org.mockito.BDDMockito.given;
3636
import static org.mockito.Mockito.mock;
3737
import static org.mockito.Mockito.verify;
38-
import static org.mockito.Mockito.verifyZeroInteractions;
38+
import static org.mockito.Mockito.verifyNoInteractions;
3939

4040
/**
4141
* Tests for {@link LambdaSafe}.
@@ -88,7 +88,7 @@ void callbackInvokeWhenHasResolvableGenericNonMatchShouldNotInvokeCallback() {
8888
GenericCallback<?> callbackInstance = mock(StringBuilderCallback.class);
8989
String argument = "foo";
9090
LambdaSafe.callback(GenericCallback.class, callbackInstance, argument).invoke((c) -> c.handle(argument));
91-
verifyZeroInteractions(callbackInstance);
91+
verifyNoInteractions(callbackInstance);
9292
}
9393

9494
@Test
@@ -164,7 +164,7 @@ void callbackInvokeAndWhenHasResolvableGenericNonMatchShouldReturnNoResult() {
164164
InvocationResult<Integer> result = LambdaSafe.callback(GenericFactory.class, callbackInstance, argument)
165165
.invokeAnd((c) -> c.handle(argument));
166166
assertThat(result.hasResult()).isFalse();
167-
verifyZeroInteractions(callbackInstance);
167+
verifyNoInteractions(callbackInstance);
168168
}
169169

170170
@Test
@@ -229,7 +229,7 @@ void callbacksInvokeWhenHasResolvableGenericNonMatchShouldNotInvokeCallback() {
229229
String argument = "foo";
230230
LambdaSafe.callbacks(GenericCallback.class, Collections.singleton(callbackInstance), argument)
231231
.invoke((c) -> c.handle(null));
232-
verifyZeroInteractions(callbackInstance);
232+
verifyNoInteractions(callbackInstance);
233233
}
234234

235235
@Test

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import static org.mockito.Mockito.mock;
6363
import static org.mockito.Mockito.spy;
6464
import static org.mockito.Mockito.verify;
65-
import static org.mockito.Mockito.verifyZeroInteractions;
65+
import static org.mockito.Mockito.verifyNoInteractions;
6666
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
6767
import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
6868

@@ -391,7 +391,7 @@ void customizersShouldReplaceExisting() {
391391
RestTemplateCustomizer customizer2 = mock(RestTemplateCustomizer.class);
392392
RestTemplate template = this.builder.customizers(customizer1).customizers(Collections.singleton(customizer2))
393393
.build();
394-
verifyZeroInteractions(customizer1);
394+
verifyNoInteractions(customizer1);
395395
verify(customizer2).customize(template);
396396
}
397397

0 commit comments

Comments
 (0)