Skip to content

Commit 62ad3e1

Browse files
eleftheriaseleftherias
committed
Replace deprecated verifyZeroInteractions in tests
1 parent 7eed842 commit 62ad3e1

File tree

9 files changed

+137
-137
lines changed

9 files changed

+137
-137
lines changed

‎spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.mockito.Mockito.mock;
3434
import static org.mockito.Mockito.times;
3535
import static org.mockito.Mockito.verify;
36-
import static org.mockito.Mockito.verifyZeroInteractions;
36+
import static org.mockito.Mockito.verifyNoMoreInteractions;
3737

3838
/**
3939
* Tests for {@link SpringSessionRememberMeServices}.
@@ -88,7 +88,7 @@ void autoLogin() {
8888
HttpServletResponse response = mock(HttpServletResponse.class);
8989
this.rememberMeServices = new SpringSessionRememberMeServices();
9090
this.rememberMeServices.autoLogin(request, response);
91-
verifyZeroInteractions(request, response);
91+
verifyNoMoreInteractions(request, response);
9292
}
9393

9494
// gh-752
@@ -102,7 +102,7 @@ void loginFailRemoveSecurityContext() {
102102
this.rememberMeServices.loginFail(request, response);
103103
verify(request, times(1)).getSession(eq(false));
104104
verify(session, times(1)).removeAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY);
105-
verifyZeroInteractions(request, response, session);
105+
verifyNoMoreInteractions(request, response, session);
106106
}
107107

108108
@Test
@@ -119,7 +119,7 @@ void loginSuccess() {
119119
verify(request, times(1)).getSession();
120120
verify(request, times(1)).setAttribute(eq(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR), eq(true));
121121
verify(session, times(1)).setMaxInactiveInterval(eq(2592000));
122-
verifyZeroInteractions(request, response, session, authentication);
122+
verifyNoMoreInteractions(request, response, session, authentication);
123123
}
124124

125125
@Test
@@ -137,7 +137,7 @@ void loginSuccessWithCustomParameter() {
137137
verify(request, times(1)).getSession();
138138
verify(request, times(1)).setAttribute(eq(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR), eq(true));
139139
verify(session, times(1)).setMaxInactiveInterval(eq(2592000));
140-
verifyZeroInteractions(request, response, session, authentication);
140+
verifyNoMoreInteractions(request, response, session, authentication);
141141
}
142142

143143
@Test
@@ -153,7 +153,7 @@ void loginSuccessWithAlwaysRemember() {
153153
verify(request, times(1)).getSession();
154154
verify(request, times(1)).setAttribute(eq(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR), eq(true));
155155
verify(session, times(1)).setMaxInactiveInterval(eq(2592000));
156-
verifyZeroInteractions(request, response, session, authentication);
156+
verifyNoMoreInteractions(request, response, session, authentication);
157157
}
158158

159159
@Test
@@ -171,7 +171,7 @@ void loginSuccessWithCustomValidity() {
171171
verify(request, times(1)).getSession();
172172
verify(request, times(1)).setAttribute(eq(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR), eq(true));
173173
verify(session, times(1)).setMaxInactiveInterval(eq(100000));
174-
verifyZeroInteractions(request, response, session, authentication);
174+
verifyNoMoreInteractions(request, response, session, authentication);
175175
}
176176

177177
}

‎spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import static org.assertj.core.api.Assertions.assertThat;
4040
import static org.mockito.Mockito.mock;
4141
import static org.mockito.Mockito.verify;
42-
import static org.mockito.Mockito.verifyZeroInteractions;
42+
import static org.mockito.Mockito.verifyNoMoreInteractions;
4343

4444
/**
4545
* Tests for {@link SessionEventHttpSessionListenerAdapter}.
@@ -97,7 +97,7 @@ void onApplicationEventEmptyListenersDoesNotUseEvent() {
9797

9898
this.listener.onApplicationEvent(this.destroyed);
9999

100-
verifyZeroInteractions(this.destroyed, this.listener1, this.listener2);
100+
verifyNoMoreInteractions(this.destroyed, this.listener1, this.listener2);
101101
}
102102

103103
@Test

‎spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
import static org.mockito.Mockito.spy;
7373
import static org.mockito.Mockito.times;
7474
import static org.mockito.Mockito.verify;
75-
import static org.mockito.Mockito.verifyZeroInteractions;
75+
import static org.mockito.Mockito.verifyNoMoreInteractions;
7676

7777
/**
7878
* Tests for {@link SessionRepositoryFilter}.
@@ -1260,7 +1260,7 @@ public void doFilter(HttpServletRequest wrappedRequest, HttpServletResponse wrap
12601260
}
12611261
});
12621262

1263-
verifyZeroInteractions(sessionRepository);
1263+
verifyNoMoreInteractions(sessionRepository);
12641264
}
12651265

12661266
@Test
@@ -1275,7 +1275,7 @@ public void doFilter(HttpServletRequest wrappedRequest, HttpServletResponse wrap
12751275
}
12761276
});
12771277

1278-
verifyZeroInteractions(sessionRepository);
1278+
verifyNoMoreInteractions(sessionRepository);
12791279
}
12801280

12811281
@Test
@@ -1293,7 +1293,7 @@ public void doFilter(HttpServletRequest wrappedRequest, HttpServletResponse wrap
12931293
}
12941294
});
12951295

1296-
verifyZeroInteractions(sessionRepository);
1296+
verifyNoMoreInteractions(sessionRepository);
12971297
}
12981298

12991299
@Test
@@ -1318,7 +1318,7 @@ public void doFilter(HttpServletRequest wrappedRequest, HttpServletResponse wrap
13181318
verify(sessionRepository).deleteById(eq(session.getId()));
13191319
verify(sessionRepository).createSession();
13201320
verify(sessionRepository).save(any());
1321-
verifyZeroInteractions(sessionRepository);
1321+
verifyNoMoreInteractions(sessionRepository);
13221322
}
13231323

13241324
// --- order

‎spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import static org.mockito.BDDMockito.given;
5050
import static org.mockito.Mockito.times;
5151
import static org.mockito.Mockito.verify;
52-
import static org.mockito.Mockito.verifyZeroInteractions;
52+
import static org.mockito.Mockito.verifyNoMoreInteractions;
5353

5454
class SessionRepositoryMessageInterceptorTests {
5555

@@ -98,7 +98,7 @@ void preSendConnectAckDoesNotInvokeSessionRepository() {
9898

9999
assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage);
100100

101-
verifyZeroInteractions(this.sessionRepository);
101+
verifyNoMoreInteractions(this.sessionRepository);
102102
}
103103

104104
@Test
@@ -107,7 +107,7 @@ void preSendHeartbeatDoesNotInvokeSessionRepository() {
107107

108108
assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage);
109109

110-
verifyZeroInteractions(this.sessionRepository);
110+
verifyNoMoreInteractions(this.sessionRepository);
111111
}
112112

113113
@Test
@@ -116,7 +116,7 @@ void preSendDisconnectDoesNotInvokeSessionRepository() {
116116

117117
assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage);
118118

119-
verifyZeroInteractions(this.sessionRepository);
119+
verifyNoMoreInteractions(this.sessionRepository);
120120
}
121121

122122
@Test
@@ -125,7 +125,7 @@ void preSendOtherDoesNotInvokeSessionRepository() {
125125

126126
assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage);
127127

128-
verifyZeroInteractions(this.sessionRepository);
128+
verifyNoMoreInteractions(this.sessionRepository);
129129
}
130130

131131
@Test
@@ -209,7 +209,7 @@ void preSendNullSessionId() {
209209

210210
assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage);
211211

212-
verifyZeroInteractions(this.sessionRepository);
212+
verifyNoMoreInteractions(this.sessionRepository);
213213
}
214214

215215
@Test
@@ -218,22 +218,22 @@ void preSendNullSessionAttributes() {
218218

219219
assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage);
220220

221-
verifyZeroInteractions(this.sessionRepository);
221+
verifyNoMoreInteractions(this.sessionRepository);
222222
}
223223

224224
@Test
225225
void beforeHandshakeNotServletServerHttpRequest() {
226226
assertThat(this.interceptor.beforeHandshake(null, null, null, null)).isTrue();
227227

228-
verifyZeroInteractions(this.sessionRepository);
228+
verifyNoMoreInteractions(this.sessionRepository);
229229
}
230230

231231
@Test
232232
void beforeHandshakeNullSession() {
233233
ServletServerHttpRequest request = new ServletServerHttpRequest(new MockHttpServletRequest());
234234
assertThat(this.interceptor.beforeHandshake(request, null, null, null)).isTrue();
235235

236-
verifyZeroInteractions(this.sessionRepository);
236+
verifyNoMoreInteractions(this.sessionRepository);
237237
}
238238

239239
@Test
@@ -256,7 +256,7 @@ void beforeHandshakeSession() {
256256
void afterHandshakeDoesNothing() {
257257
this.interceptor.afterHandshake(null, null, null, null);
258258

259-
verifyZeroInteractions(this.sessionRepository);
259+
verifyNoMoreInteractions(this.sessionRepository);
260260
}
261261

262262
private void setSessionId(String id) {

‎spring-session-data-redis/src/test/java/org/springframework/session/data/redis/ReactiveRedisSessionRepositoryTests.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import static org.mockito.BDDMockito.given;
4444
import static org.mockito.Mockito.mock;
4545
import static org.mockito.Mockito.verify;
46-
import static org.mockito.Mockito.verifyZeroInteractions;
46+
import static org.mockito.Mockito.verifyNoMoreInteractions;
4747

4848
/**
4949
* Tests for {@link ReactiveRedisSessionRepository}.
@@ -137,8 +137,8 @@ void saveNewSession() {
137137
verify(this.redisOperations).opsForHash();
138138
verify(this.hashOperations).putAll(anyString(), this.delta.capture());
139139
verify(this.redisOperations).expire(anyString(), any());
140-
verifyZeroInteractions(this.redisOperations);
141-
verifyZeroInteractions(this.hashOperations);
140+
verifyNoMoreInteractions(this.redisOperations);
141+
verifyNoMoreInteractions(this.hashOperations);
142142

143143
Map<String, Object> delta = this.delta.getAllValues().get(0);
144144
assertThat(delta.size()).isEqualTo(3);
@@ -160,8 +160,8 @@ void saveSessionNothingChanged() {
160160
StepVerifier.create(this.repository.save(session)).verifyComplete();
161161

162162
verify(this.redisOperations).hasKey(anyString());
163-
verifyZeroInteractions(this.redisOperations);
164-
verifyZeroInteractions(this.hashOperations);
163+
verifyNoMoreInteractions(this.redisOperations);
164+
verifyNoMoreInteractions(this.hashOperations);
165165
}
166166

167167
@Test
@@ -179,8 +179,8 @@ void saveLastAccessChanged() {
179179
verify(this.redisOperations).opsForHash();
180180
verify(this.hashOperations).putAll(anyString(), this.delta.capture());
181181
verify(this.redisOperations).expire(anyString(), any());
182-
verifyZeroInteractions(this.redisOperations);
183-
verifyZeroInteractions(this.hashOperations);
182+
verifyNoMoreInteractions(this.redisOperations);
183+
verifyNoMoreInteractions(this.hashOperations);
184184

185185
assertThat(this.delta.getAllValues().get(0)).isEqualTo(
186186
map(RedisSessionMapper.LAST_ACCESSED_TIME_KEY, session.getLastAccessedTime().toEpochMilli()));
@@ -202,8 +202,8 @@ void saveSetAttribute() {
202202
verify(this.redisOperations).opsForHash();
203203
verify(this.hashOperations).putAll(anyString(), this.delta.capture());
204204
verify(this.redisOperations).expire(anyString(), any());
205-
verifyZeroInteractions(this.redisOperations);
206-
verifyZeroInteractions(this.hashOperations);
205+
verifyNoMoreInteractions(this.redisOperations);
206+
verifyNoMoreInteractions(this.hashOperations);
207207

208208
assertThat(this.delta.getAllValues().get(0)).isEqualTo(
209209
map(RedisIndexedSessionRepository.getSessionAttrNameKey(attrName), session.getAttribute(attrName)));
@@ -225,8 +225,8 @@ void saveRemoveAttribute() {
225225
verify(this.redisOperations).opsForHash();
226226
verify(this.hashOperations).putAll(anyString(), this.delta.capture());
227227
verify(this.redisOperations).expire(anyString(), any());
228-
verifyZeroInteractions(this.redisOperations);
229-
verifyZeroInteractions(this.hashOperations);
228+
verifyNoMoreInteractions(this.redisOperations);
229+
verifyNoMoreInteractions(this.hashOperations);
230230

231231
assertThat(this.delta.getAllValues().get(0))
232232
.isEqualTo(map(RedisIndexedSessionRepository.getSessionAttrNameKey(attrName), null));
@@ -252,8 +252,8 @@ void delete() {
252252
StepVerifier.create(this.repository.deleteById("test")).verifyComplete();
253253

254254
verify(this.redisOperations).delete(anyString());
255-
verifyZeroInteractions(this.redisOperations);
256-
verifyZeroInteractions(this.hashOperations);
255+
verifyNoMoreInteractions(this.redisOperations);
256+
verifyNoMoreInteractions(this.hashOperations);
257257
}
258258

259259
@Test
@@ -267,8 +267,8 @@ void getSessionNotFound() {
267267
verify(this.redisOperations).opsForHash();
268268
verify(this.hashOperations).entries(anyString());
269269
verify(this.redisOperations).delete(anyString());
270-
verifyZeroInteractions(this.redisOperations);
271-
verifyZeroInteractions(this.hashOperations);
270+
verifyNoMoreInteractions(this.redisOperations);
271+
verifyNoMoreInteractions(this.hashOperations);
272272
}
273273

274274
@Test
@@ -291,8 +291,8 @@ void getSessionFound() {
291291
StepVerifier.create(this.repository.findById("test")).consumeNextWith((session) -> {
292292
verify(this.redisOperations).opsForHash();
293293
verify(this.hashOperations).entries(anyString());
294-
verifyZeroInteractions(this.redisOperations);
295-
verifyZeroInteractions(this.hashOperations);
294+
verifyNoMoreInteractions(this.redisOperations);
295+
verifyNoMoreInteractions(this.hashOperations);
296296

297297
assertThat(session.getId()).isEqualTo(expected.getId());
298298
assertThat(session.getAttributeNames()).isEqualTo(expected.getAttributeNames());
@@ -320,8 +320,8 @@ void getSessionExpired() {
320320
verify(this.redisOperations).opsForHash();
321321
verify(this.hashOperations).entries(anyString());
322322
verify(this.redisOperations).delete(anyString());
323-
verifyZeroInteractions(this.redisOperations);
324-
verifyZeroInteractions(this.hashOperations);
323+
verifyNoMoreInteractions(this.redisOperations);
324+
verifyNoMoreInteractions(this.hashOperations);
325325
}
326326

327327
@Test // gh-1120
@@ -357,8 +357,8 @@ void saveWithSaveModeOnSetAttribute() {
357357
verify(this.hashOperations).putAll(anyString(), this.delta.capture());
358358
assertThat(this.delta.getValue()).hasSize(1);
359359
verify(this.redisOperations).expire(anyString(), any());
360-
verifyZeroInteractions(this.redisOperations);
361-
verifyZeroInteractions(this.hashOperations);
360+
verifyNoMoreInteractions(this.redisOperations);
361+
verifyNoMoreInteractions(this.hashOperations);
362362
}
363363

364364
@Test
@@ -381,8 +381,8 @@ void saveWithSaveModeOnGetAttribute() {
381381
verify(this.hashOperations).putAll(anyString(), this.delta.capture());
382382
assertThat(this.delta.getValue()).hasSize(2);
383383
verify(this.redisOperations).expire(anyString(), any());
384-
verifyZeroInteractions(this.redisOperations);
385-
verifyZeroInteractions(this.hashOperations);
384+
verifyNoMoreInteractions(this.redisOperations);
385+
verifyNoMoreInteractions(this.hashOperations);
386386
}
387387

388388
@Test
@@ -405,8 +405,8 @@ void saveWithSaveModeAlways() {
405405
verify(this.hashOperations).putAll(anyString(), this.delta.capture());
406406
assertThat(this.delta.getValue()).hasSize(3);
407407
verify(this.redisOperations).expire(anyString(), any());
408-
verifyZeroInteractions(this.redisOperations);
409-
verifyZeroInteractions(this.hashOperations);
408+
verifyNoMoreInteractions(this.redisOperations);
409+
verifyNoMoreInteractions(this.hashOperations);
410410
}
411411

412412
private Map<String, Object> map(Object... objects) {

0 commit comments

Comments
 (0)