From 62ad3e1babaa2200217b9eb5545ec2625dd26d24 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 29 Jan 2021 17:00:03 +0100 Subject: [PATCH] Replace deprecated verifyZeroInteractions in tests --- .../SpringSessionRememberMeServicesTests.java | 14 ++--- ...nEventHttpSessionListenerAdapterTests.java | 4 +- .../http/SessionRepositoryFilterTests.java | 10 ++-- ...sionRepositoryMessageInterceptorTests.java | 20 +++---- .../ReactiveRedisSessionRepositoryTests.java | 50 ++++++++-------- .../RedisIndexedSessionRepositoryTests.java | 52 ++++++++-------- ...edisHttpSessionConfigurationMockTests.java | 4 +- ...zelcast4IndexedSessionRepositoryTests.java | 60 +++++++++---------- ...azelcastIndexedSessionRepositoryTests.java | 60 +++++++++---------- 9 files changed, 137 insertions(+), 137 deletions(-) diff --git a/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java b/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java index b6326b98..75fb7d58 100644 --- a/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java @@ -33,7 +33,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; /** * Tests for {@link SpringSessionRememberMeServices}. @@ -88,7 +88,7 @@ class SpringSessionRememberMeServicesTests { HttpServletResponse response = mock(HttpServletResponse.class); this.rememberMeServices = new SpringSessionRememberMeServices(); this.rememberMeServices.autoLogin(request, response); - verifyZeroInteractions(request, response); + verifyNoMoreInteractions(request, response); } // gh-752 @@ -102,7 +102,7 @@ class SpringSessionRememberMeServicesTests { this.rememberMeServices.loginFail(request, response); verify(request, times(1)).getSession(eq(false)); verify(session, times(1)).removeAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY); - verifyZeroInteractions(request, response, session); + verifyNoMoreInteractions(request, response, session); } @Test @@ -119,7 +119,7 @@ class SpringSessionRememberMeServicesTests { verify(request, times(1)).getSession(); verify(request, times(1)).setAttribute(eq(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR), eq(true)); verify(session, times(1)).setMaxInactiveInterval(eq(2592000)); - verifyZeroInteractions(request, response, session, authentication); + verifyNoMoreInteractions(request, response, session, authentication); } @Test @@ -137,7 +137,7 @@ class SpringSessionRememberMeServicesTests { verify(request, times(1)).getSession(); verify(request, times(1)).setAttribute(eq(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR), eq(true)); verify(session, times(1)).setMaxInactiveInterval(eq(2592000)); - verifyZeroInteractions(request, response, session, authentication); + verifyNoMoreInteractions(request, response, session, authentication); } @Test @@ -153,7 +153,7 @@ class SpringSessionRememberMeServicesTests { verify(request, times(1)).getSession(); verify(request, times(1)).setAttribute(eq(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR), eq(true)); verify(session, times(1)).setMaxInactiveInterval(eq(2592000)); - verifyZeroInteractions(request, response, session, authentication); + verifyNoMoreInteractions(request, response, session, authentication); } @Test @@ -171,7 +171,7 @@ class SpringSessionRememberMeServicesTests { verify(request, times(1)).getSession(); verify(request, times(1)).setAttribute(eq(SpringSessionRememberMeServices.REMEMBER_ME_LOGIN_ATTR), eq(true)); verify(session, times(1)).setMaxInactiveInterval(eq(100000)); - verifyZeroInteractions(request, response, session, authentication); + verifyNoMoreInteractions(request, response, session, authentication); } } diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java index 7a2be0ca..107e5cb8 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java @@ -39,7 +39,7 @@ import org.springframework.session.events.SessionDestroyedEvent; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; /** * Tests for {@link SessionEventHttpSessionListenerAdapter}. @@ -97,7 +97,7 @@ class SessionEventHttpSessionListenerAdapterTests { this.listener.onApplicationEvent(this.destroyed); - verifyZeroInteractions(this.destroyed, this.listener1, this.listener2); + verifyNoMoreInteractions(this.destroyed, this.listener1, this.listener2); } @Test diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java index 2b1a5f84..7b2be324 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java @@ -72,7 +72,7 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; /** * Tests for {@link SessionRepositoryFilter}. @@ -1260,7 +1260,7 @@ class SessionRepositoryFilterTests { } }); - verifyZeroInteractions(sessionRepository); + verifyNoMoreInteractions(sessionRepository); } @Test @@ -1275,7 +1275,7 @@ class SessionRepositoryFilterTests { } }); - verifyZeroInteractions(sessionRepository); + verifyNoMoreInteractions(sessionRepository); } @Test @@ -1293,7 +1293,7 @@ class SessionRepositoryFilterTests { } }); - verifyZeroInteractions(sessionRepository); + verifyNoMoreInteractions(sessionRepository); } @Test @@ -1318,7 +1318,7 @@ class SessionRepositoryFilterTests { verify(sessionRepository).deleteById(eq(session.getId())); verify(sessionRepository).createSession(); verify(sessionRepository).save(any()); - verifyZeroInteractions(sessionRepository); + verifyNoMoreInteractions(sessionRepository); } // --- order diff --git a/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java b/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java index 0ba17347..7db46eaa 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java @@ -49,7 +49,7 @@ import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; class SessionRepositoryMessageInterceptorTests { @@ -98,7 +98,7 @@ class SessionRepositoryMessageInterceptorTests { assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage); - verifyZeroInteractions(this.sessionRepository); + verifyNoMoreInteractions(this.sessionRepository); } @Test @@ -107,7 +107,7 @@ class SessionRepositoryMessageInterceptorTests { assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage); - verifyZeroInteractions(this.sessionRepository); + verifyNoMoreInteractions(this.sessionRepository); } @Test @@ -116,7 +116,7 @@ class SessionRepositoryMessageInterceptorTests { assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage); - verifyZeroInteractions(this.sessionRepository); + verifyNoMoreInteractions(this.sessionRepository); } @Test @@ -125,7 +125,7 @@ class SessionRepositoryMessageInterceptorTests { assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage); - verifyZeroInteractions(this.sessionRepository); + verifyNoMoreInteractions(this.sessionRepository); } @Test @@ -209,7 +209,7 @@ class SessionRepositoryMessageInterceptorTests { assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage); - verifyZeroInteractions(this.sessionRepository); + verifyNoMoreInteractions(this.sessionRepository); } @Test @@ -218,14 +218,14 @@ class SessionRepositoryMessageInterceptorTests { assertThat(this.interceptor.preSend(createMessage(), this.channel)).isSameAs(this.createMessage); - verifyZeroInteractions(this.sessionRepository); + verifyNoMoreInteractions(this.sessionRepository); } @Test void beforeHandshakeNotServletServerHttpRequest() { assertThat(this.interceptor.beforeHandshake(null, null, null, null)).isTrue(); - verifyZeroInteractions(this.sessionRepository); + verifyNoMoreInteractions(this.sessionRepository); } @Test @@ -233,7 +233,7 @@ class SessionRepositoryMessageInterceptorTests { ServletServerHttpRequest request = new ServletServerHttpRequest(new MockHttpServletRequest()); assertThat(this.interceptor.beforeHandshake(request, null, null, null)).isTrue(); - verifyZeroInteractions(this.sessionRepository); + verifyNoMoreInteractions(this.sessionRepository); } @Test @@ -256,7 +256,7 @@ class SessionRepositoryMessageInterceptorTests { void afterHandshakeDoesNothing() { this.interceptor.afterHandshake(null, null, null, null); - verifyZeroInteractions(this.sessionRepository); + verifyNoMoreInteractions(this.sessionRepository); } private void setSessionId(String id) { diff --git a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/ReactiveRedisSessionRepositoryTests.java b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/ReactiveRedisSessionRepositoryTests.java index da58aadf..b860479a 100644 --- a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/ReactiveRedisSessionRepositoryTests.java +++ b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/ReactiveRedisSessionRepositoryTests.java @@ -43,7 +43,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; /** * Tests for {@link ReactiveRedisSessionRepository}. @@ -137,8 +137,8 @@ class ReactiveRedisSessionRepositoryTests { verify(this.redisOperations).opsForHash(); verify(this.hashOperations).putAll(anyString(), this.delta.capture()); verify(this.redisOperations).expire(anyString(), any()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); Map delta = this.delta.getAllValues().get(0); assertThat(delta.size()).isEqualTo(3); @@ -160,8 +160,8 @@ class ReactiveRedisSessionRepositoryTests { StepVerifier.create(this.repository.save(session)).verifyComplete(); verify(this.redisOperations).hasKey(anyString()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); } @Test @@ -179,8 +179,8 @@ class ReactiveRedisSessionRepositoryTests { verify(this.redisOperations).opsForHash(); verify(this.hashOperations).putAll(anyString(), this.delta.capture()); verify(this.redisOperations).expire(anyString(), any()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); assertThat(this.delta.getAllValues().get(0)).isEqualTo( map(RedisSessionMapper.LAST_ACCESSED_TIME_KEY, session.getLastAccessedTime().toEpochMilli())); @@ -202,8 +202,8 @@ class ReactiveRedisSessionRepositoryTests { verify(this.redisOperations).opsForHash(); verify(this.hashOperations).putAll(anyString(), this.delta.capture()); verify(this.redisOperations).expire(anyString(), any()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); assertThat(this.delta.getAllValues().get(0)).isEqualTo( map(RedisIndexedSessionRepository.getSessionAttrNameKey(attrName), session.getAttribute(attrName))); @@ -225,8 +225,8 @@ class ReactiveRedisSessionRepositoryTests { verify(this.redisOperations).opsForHash(); verify(this.hashOperations).putAll(anyString(), this.delta.capture()); verify(this.redisOperations).expire(anyString(), any()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); assertThat(this.delta.getAllValues().get(0)) .isEqualTo(map(RedisIndexedSessionRepository.getSessionAttrNameKey(attrName), null)); @@ -252,8 +252,8 @@ class ReactiveRedisSessionRepositoryTests { StepVerifier.create(this.repository.deleteById("test")).verifyComplete(); verify(this.redisOperations).delete(anyString()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); } @Test @@ -267,8 +267,8 @@ class ReactiveRedisSessionRepositoryTests { verify(this.redisOperations).opsForHash(); verify(this.hashOperations).entries(anyString()); verify(this.redisOperations).delete(anyString()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); } @Test @@ -291,8 +291,8 @@ class ReactiveRedisSessionRepositoryTests { StepVerifier.create(this.repository.findById("test")).consumeNextWith((session) -> { verify(this.redisOperations).opsForHash(); verify(this.hashOperations).entries(anyString()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); assertThat(session.getId()).isEqualTo(expected.getId()); assertThat(session.getAttributeNames()).isEqualTo(expected.getAttributeNames()); @@ -320,8 +320,8 @@ class ReactiveRedisSessionRepositoryTests { verify(this.redisOperations).opsForHash(); verify(this.hashOperations).entries(anyString()); verify(this.redisOperations).delete(anyString()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); } @Test // gh-1120 @@ -357,8 +357,8 @@ class ReactiveRedisSessionRepositoryTests { verify(this.hashOperations).putAll(anyString(), this.delta.capture()); assertThat(this.delta.getValue()).hasSize(1); verify(this.redisOperations).expire(anyString(), any()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); } @Test @@ -381,8 +381,8 @@ class ReactiveRedisSessionRepositoryTests { verify(this.hashOperations).putAll(anyString(), this.delta.capture()); assertThat(this.delta.getValue()).hasSize(2); verify(this.redisOperations).expire(anyString(), any()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); } @Test @@ -405,8 +405,8 @@ class ReactiveRedisSessionRepositoryTests { verify(this.hashOperations).putAll(anyString(), this.delta.capture()); assertThat(this.delta.getValue()).hasSize(3); verify(this.redisOperations).expire(anyString(), any()); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.hashOperations); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.hashOperations); } private Map map(Object... objects) { diff --git a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryTests.java b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryTests.java index 658c8a45..73e1f690 100644 --- a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryTests.java +++ b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryTests.java @@ -63,7 +63,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; class RedisIndexedSessionRepositoryTests { @@ -188,7 +188,7 @@ class RedisIndexedSessionRepositoryTests { this.redisRepository.save(session); - verifyZeroInteractions(this.redisOperations); + verifyNoMoreInteractions(this.redisOperations); } @Test @@ -511,10 +511,10 @@ class RedisIndexedSessionRepositoryTests { verify(this.boundHashOperations).entries(); verify(this.publisher).publishEvent(this.event.capture()); assertThat(this.event.getValue().getSessionId()).isEqualTo(deletedId); - verifyZeroInteractions(this.defaultSerializer); - verifyZeroInteractions(this.publisher); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.boundHashOperations); + verifyNoMoreInteractions(this.defaultSerializer); + verifyNoMoreInteractions(this.publisher); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.boundHashOperations); } @Test @@ -534,10 +534,10 @@ class RedisIndexedSessionRepositoryTests { verify(this.redisOperations).boundHashOps(eq(getKey(deletedId))); verify(this.boundHashOperations).entries(); - verifyZeroInteractions(this.defaultSerializer); - verifyZeroInteractions(this.publisher); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.boundHashOperations); + verifyNoMoreInteractions(this.defaultSerializer); + verifyNoMoreInteractions(this.publisher); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.boundHashOperations); } @Test @@ -561,10 +561,10 @@ class RedisIndexedSessionRepositoryTests { verify(this.boundHashOperations).entries(); verify(this.publisher).publishEvent(this.event.capture()); assertThat(this.event.getValue().getSessionId()).isEqualTo(expiredId); - verifyZeroInteractions(this.defaultSerializer); - verifyZeroInteractions(this.publisher); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.boundHashOperations); + verifyNoMoreInteractions(this.defaultSerializer); + verifyNoMoreInteractions(this.publisher); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.boundHashOperations); } @Test @@ -584,17 +584,17 @@ class RedisIndexedSessionRepositoryTests { verify(this.redisOperations).boundHashOps(eq(getKey(expiredId))); verify(this.boundHashOperations).entries(); - verifyZeroInteractions(this.defaultSerializer); - verifyZeroInteractions(this.publisher); - verifyZeroInteractions(this.redisOperations); - verifyZeroInteractions(this.boundHashOperations); + verifyNoMoreInteractions(this.defaultSerializer); + verifyNoMoreInteractions(this.publisher); + verifyNoMoreInteractions(this.redisOperations); + verifyNoMoreInteractions(this.boundHashOperations); } @Test void flushModeOnSaveCreate() { this.redisRepository.createSession(); - verifyZeroInteractions(this.boundHashOperations); + verifyNoMoreInteractions(this.boundHashOperations); } @Test @@ -602,7 +602,7 @@ class RedisIndexedSessionRepositoryTests { RedisSession session = this.redisRepository.createSession(); session.setAttribute("something", "here"); - verifyZeroInteractions(this.boundHashOperations); + verifyNoMoreInteractions(this.boundHashOperations); } @Test @@ -610,7 +610,7 @@ class RedisIndexedSessionRepositoryTests { RedisSession session = this.redisRepository.createSession(); session.removeAttribute("remove"); - verifyZeroInteractions(this.boundHashOperations); + verifyNoMoreInteractions(this.boundHashOperations); } @Test @@ -618,7 +618,7 @@ class RedisIndexedSessionRepositoryTests { RedisSession session = this.redisRepository.createSession(); session.setLastAccessedTime(Instant.ofEpochMilli(1L)); - verifyZeroInteractions(this.boundHashOperations); + verifyNoMoreInteractions(this.boundHashOperations); } @Test @@ -626,7 +626,7 @@ class RedisIndexedSessionRepositoryTests { RedisSession session = this.redisRepository.createSession(); session.setMaxInactiveInterval(Duration.ofSeconds(1)); - verifyZeroInteractions(this.boundHashOperations); + verifyNoMoreInteractions(this.boundHashOperations); } @Test @@ -790,7 +790,7 @@ class RedisIndexedSessionRepositoryTests { this.redisRepository.onMessage(message, "".getBytes(StandardCharsets.UTF_8)); assertThat(this.event.getAllValues()).isEmpty(); - verifyZeroInteractions(this.publisher); + verifyNoMoreInteractions(this.publisher); } @Test @@ -808,7 +808,7 @@ class RedisIndexedSessionRepositoryTests { this.redisRepository.onMessage(message, "".getBytes(StandardCharsets.UTF_8)); assertThat(this.event.getAllValues()).isEmpty(); - verifyZeroInteractions(this.publisher); + verifyNoMoreInteractions(this.publisher); } @Test @@ -826,7 +826,7 @@ class RedisIndexedSessionRepositoryTests { this.redisRepository.onMessage(message, "".getBytes(StandardCharsets.UTF_8)); assertThat(this.event.getAllValues()).isEmpty(); - verifyZeroInteractions(this.publisher); + verifyNoMoreInteractions(this.publisher); } @Test diff --git a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationMockTests.java b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationMockTests.java index 6ca36337..03b8ef1b 100644 --- a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationMockTests.java +++ b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationMockTests.java @@ -30,7 +30,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; class RedisHttpSessionConfigurationMockTests { @@ -53,7 +53,7 @@ class RedisHttpSessionConfigurationMockTests { init.afterPropertiesSet(); - verifyZeroInteractions(this.factory); + verifyNoMoreInteractions(this.factory); } @Test diff --git a/spring-session-hazelcast/hazelcast4/src/test/java/org/springframework/session/hazelcast/Hazelcast4IndexedSessionRepositoryTests.java b/spring-session-hazelcast/hazelcast4/src/test/java/org/springframework/session/hazelcast/Hazelcast4IndexedSessionRepositoryTests.java index f457c8fa..c1337ae9 100644 --- a/spring-session-hazelcast/hazelcast4/src/test/java/org/springframework/session/hazelcast/Hazelcast4IndexedSessionRepositoryTests.java +++ b/spring-session-hazelcast/hazelcast4/src/test/java/org/springframework/session/hazelcast/Hazelcast4IndexedSessionRepositoryTests.java @@ -54,7 +54,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; /** * Tests for {@link Hazelcast4IndexedSessionRepository}. @@ -98,7 +98,7 @@ class Hazelcast4IndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); assertThat(session.getMaxInactiveInterval()).isEqualTo(new MapSession().getMaxInactiveInterval()); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -111,7 +111,7 @@ class Hazelcast4IndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); assertThat(session.getMaxInactiveInterval()).isEqualTo(Duration.ofSeconds(interval)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -119,12 +119,12 @@ class Hazelcast4IndexedSessionRepositoryTests { verify(this.sessions, times(1)).addEntryListener(any(MapListener.class), anyBoolean()); HazelcastSession session = this.repository.createSession(); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -136,7 +136,7 @@ class Hazelcast4IndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -145,12 +145,12 @@ class Hazelcast4IndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); session.setAttribute("testName", "testValue"); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -166,7 +166,7 @@ class Hazelcast4IndexedSessionRepositoryTests { verify(this.sessions, times(1)).executeOnKey(eq(session.getId()), any(EntryProcessor.class)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -175,12 +175,12 @@ class Hazelcast4IndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); session.removeAttribute("testName"); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -196,7 +196,7 @@ class Hazelcast4IndexedSessionRepositoryTests { verify(this.sessions, times(1)).executeOnKey(eq(session.getId()), any(EntryProcessor.class)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -205,12 +205,12 @@ class Hazelcast4IndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); session.setLastAccessedTime(Instant.now()); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -226,7 +226,7 @@ class Hazelcast4IndexedSessionRepositoryTests { verify(this.sessions, times(1)).executeOnKey(eq(session.getId()), any(EntryProcessor.class)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -235,12 +235,12 @@ class Hazelcast4IndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); session.setMaxInactiveInterval(Duration.ofSeconds(1)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -258,7 +258,7 @@ class Hazelcast4IndexedSessionRepositoryTests { verify(this.sessions, times(1)).executeOnKey(eq(sessionId), any(EntryProcessor.class)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -271,7 +271,7 @@ class Hazelcast4IndexedSessionRepositoryTests { eq(TimeUnit.SECONDS)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -285,7 +285,7 @@ class Hazelcast4IndexedSessionRepositoryTests { eq(TimeUnit.SECONDS)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -298,7 +298,7 @@ class Hazelcast4IndexedSessionRepositoryTests { assertThat(session).isNull(); verify(this.sessions, times(1)).get(eq(sessionId)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -314,7 +314,7 @@ class Hazelcast4IndexedSessionRepositoryTests { assertThat(session).isNull(); verify(this.sessions, times(1)).get(eq(expired.getId())); verify(this.sessions, times(1)).remove(eq(expired.getId())); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -330,7 +330,7 @@ class Hazelcast4IndexedSessionRepositoryTests { assertThat(session.getId()).isEqualTo(saved.getId()); assertThat(session.getAttribute("savedName")).isEqualTo("savedValue"); verify(this.sessions, times(1)).get(eq(saved.getId())); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -342,7 +342,7 @@ class Hazelcast4IndexedSessionRepositoryTests { this.repository.deleteById(sessionId); verify(this.sessions, times(1)).remove(eq(sessionId)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -355,7 +355,7 @@ class Hazelcast4IndexedSessionRepositoryTests { indexValue); assertThat(sessions).isEmpty(); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -369,7 +369,7 @@ class Hazelcast4IndexedSessionRepositoryTests { assertThat(sessions).isEmpty(); verify(this.sessions, times(1)).values(isA(EqualPredicate.class)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -393,7 +393,7 @@ class Hazelcast4IndexedSessionRepositoryTests { assertThat(sessions).hasSize(2); verify(this.sessions, times(1)).values(isA(EqualPredicate.class)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test // gh-1120 @@ -426,7 +426,7 @@ class Hazelcast4IndexedSessionRepositoryTests { .forClass(Hazelcast4SessionUpdateEntryProcessor.class); verify(this.sessions).executeOnKey(eq(session.getId()), captor.capture()); assertThat((Map) ReflectionTestUtils.getField(captor.getValue(), "delta")).hasSize(1); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -446,7 +446,7 @@ class Hazelcast4IndexedSessionRepositoryTests { .forClass(Hazelcast4SessionUpdateEntryProcessor.class); verify(this.sessions).executeOnKey(eq(session.getId()), captor.capture()); assertThat((Map) ReflectionTestUtils.getField(captor.getValue(), "delta")).hasSize(2); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -466,7 +466,7 @@ class Hazelcast4IndexedSessionRepositoryTests { .forClass(Hazelcast4SessionUpdateEntryProcessor.class); verify(this.sessions).executeOnKey(eq(session.getId()), captor.capture()); assertThat((Map) ReflectionTestUtils.getField(captor.getValue(), "delta")).hasSize(3); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } } diff --git a/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastIndexedSessionRepositoryTests.java b/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastIndexedSessionRepositoryTests.java index f648bfe5..2441647b 100644 --- a/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastIndexedSessionRepositoryTests.java +++ b/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastIndexedSessionRepositoryTests.java @@ -54,7 +54,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; /** * Tests for {@link HazelcastIndexedSessionRepository}. @@ -99,7 +99,7 @@ class HazelcastIndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); assertThat(session.getMaxInactiveInterval()).isEqualTo(new MapSession().getMaxInactiveInterval()); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -112,7 +112,7 @@ class HazelcastIndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); assertThat(session.getMaxInactiveInterval()).isEqualTo(Duration.ofSeconds(interval)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -120,12 +120,12 @@ class HazelcastIndexedSessionRepositoryTests { verify(this.sessions, times(1)).addEntryListener(any(MapListener.class), anyBoolean()); HazelcastSession session = this.repository.createSession(); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -137,7 +137,7 @@ class HazelcastIndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -146,12 +146,12 @@ class HazelcastIndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); session.setAttribute("testName", "testValue"); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -167,7 +167,7 @@ class HazelcastIndexedSessionRepositoryTests { verify(this.sessions, times(1)).executeOnKey(eq(session.getId()), any(EntryProcessor.class)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -176,12 +176,12 @@ class HazelcastIndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); session.removeAttribute("testName"); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -197,7 +197,7 @@ class HazelcastIndexedSessionRepositoryTests { verify(this.sessions, times(1)).executeOnKey(eq(session.getId()), any(EntryProcessor.class)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -206,12 +206,12 @@ class HazelcastIndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); session.setLastAccessedTime(Instant.now()); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -227,7 +227,7 @@ class HazelcastIndexedSessionRepositoryTests { verify(this.sessions, times(1)).executeOnKey(eq(session.getId()), any(EntryProcessor.class)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -236,12 +236,12 @@ class HazelcastIndexedSessionRepositoryTests { HazelcastSession session = this.repository.createSession(); session.setMaxInactiveInterval(Duration.ofSeconds(1)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); this.repository.save(session); verify(this.sessions, times(1)).set(eq(session.getId()), eq(session.getDelegate()), isA(Long.class), eq(TimeUnit.SECONDS)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -259,7 +259,7 @@ class HazelcastIndexedSessionRepositoryTests { verify(this.sessions, times(1)).executeOnKey(eq(sessionId), any(EntryProcessor.class)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -272,7 +272,7 @@ class HazelcastIndexedSessionRepositoryTests { eq(TimeUnit.SECONDS)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -286,7 +286,7 @@ class HazelcastIndexedSessionRepositoryTests { eq(TimeUnit.SECONDS)); this.repository.save(session); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -299,7 +299,7 @@ class HazelcastIndexedSessionRepositoryTests { assertThat(session).isNull(); verify(this.sessions, times(1)).get(eq(sessionId)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -315,7 +315,7 @@ class HazelcastIndexedSessionRepositoryTests { assertThat(session).isNull(); verify(this.sessions, times(1)).get(eq(expired.getId())); verify(this.sessions, times(1)).remove(eq(expired.getId())); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -331,7 +331,7 @@ class HazelcastIndexedSessionRepositoryTests { assertThat(session.getId()).isEqualTo(saved.getId()); assertThat(session.getAttribute("savedName")).isEqualTo("savedValue"); verify(this.sessions, times(1)).get(eq(saved.getId())); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -343,7 +343,7 @@ class HazelcastIndexedSessionRepositoryTests { this.repository.deleteById(sessionId); verify(this.sessions, times(1)).remove(eq(sessionId)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -356,7 +356,7 @@ class HazelcastIndexedSessionRepositoryTests { indexValue); assertThat(sessions).isEmpty(); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -370,7 +370,7 @@ class HazelcastIndexedSessionRepositoryTests { assertThat(sessions).isEmpty(); verify(this.sessions, times(1)).values(isA(EqualPredicate.class)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -394,7 +394,7 @@ class HazelcastIndexedSessionRepositoryTests { assertThat(sessions).hasSize(2); verify(this.sessions, times(1)).values(isA(EqualPredicate.class)); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test // gh-1120 @@ -426,7 +426,7 @@ class HazelcastIndexedSessionRepositoryTests { ArgumentCaptor captor = ArgumentCaptor.forClass(SessionUpdateEntryProcessor.class); verify(this.sessions).executeOnKey(eq(session.getId()), captor.capture()); assertThat((Map) ReflectionTestUtils.getField(captor.getValue(), "delta")).hasSize(1); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -445,7 +445,7 @@ class HazelcastIndexedSessionRepositoryTests { ArgumentCaptor captor = ArgumentCaptor.forClass(SessionUpdateEntryProcessor.class); verify(this.sessions).executeOnKey(eq(session.getId()), captor.capture()); assertThat((Map) ReflectionTestUtils.getField(captor.getValue(), "delta")).hasSize(2); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } @Test @@ -464,7 +464,7 @@ class HazelcastIndexedSessionRepositoryTests { ArgumentCaptor captor = ArgumentCaptor.forClass(SessionUpdateEntryProcessor.class); verify(this.sessions).executeOnKey(eq(session.getId()), captor.capture()); assertThat((Map) ReflectionTestUtils.getField(captor.getValue(), "delta")).hasSize(3); - verifyZeroInteractions(this.sessions); + verifyNoMoreInteractions(this.sessions); } }