diff --git a/docs/build.gradle b/docs/build.gradle index 1b9c343f..f66cf249 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -31,7 +31,7 @@ dependencies { 'junit:junit:4.11', 'org.mockito:mockito-core:1.9.5', "org.springframework:spring-test:$springVersion", - 'org.easytesting:fest-assert:1.4', + "org.assertj:assertj-core:$assertjVersion", "com.hazelcast:hazelcast:$hazelcastVersion", "redis.clients:jedis:2.4.1", "javax.servlet:javax.servlet-api:$servletApiVersion" diff --git a/docs/src/test/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java b/docs/src/test/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java index 55b97e89..994c14bf 100644 --- a/docs/src/test/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java +++ b/docs/src/test/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java @@ -15,7 +15,7 @@ */ package docs; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.mock; import org.junit.Test; diff --git a/docs/src/test/java/docs/IndexDocTests.java b/docs/src/test/java/docs/IndexDocTests.java index c3db7df3..1229ab5a 100644 --- a/docs/src/test/java/docs/IndexDocTests.java +++ b/docs/src/test/java/docs/IndexDocTests.java @@ -15,10 +15,9 @@ */ package docs; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.mock.web.MockServletContext; import org.springframework.session.ExpiringSession; diff --git a/docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java b/docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java index 5578dc74..32bbd4f5 100644 --- a/docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java +++ b/docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java @@ -15,7 +15,7 @@ */ package docs.http; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/gradle.properties b/gradle.properties index 0506d8bd..8ed47e3f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,3 +14,4 @@ spockVersion=0.7-groovy-2.0 commonsPoolVersion=2.2 springDataRedisVersion=1.4.2.RELEASE hazelcastVersion=3.5.1 +assertjVersion=3.3.0 \ No newline at end of file diff --git a/samples/findbyusername/build.gradle b/samples/findbyusername/build.gradle index 91eb7f65..a9dc1af1 100644 --- a/samples/findbyusername/build.gradle +++ b/samples/findbyusername/build.gradle @@ -27,7 +27,7 @@ dependencies { "org.apache.httpcomponents:httpclient:4.4.1" testCompile "org.springframework.boot:spring-boot-starter-test", - 'org.easytesting:fest-assert:1.4' + "org.assertj:assertj-core:$assertjVersion" integrationTestCompile gebDependencies, "org.spockframework:spock-spring:$spockVersion" diff --git a/samples/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java b/samples/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java index 9fa0b5a4..da098b59 100644 --- a/samples/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java +++ b/samples/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java @@ -15,7 +15,7 @@ */ package sample.session; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; diff --git a/spring-session/build.gradle b/spring-session/build.gradle index 97ba8e09..f0113246 100644 --- a/spring-session/build.gradle +++ b/spring-session/build.gradle @@ -28,7 +28,7 @@ dependencies { testCompile "junit:junit:$junitVersion", 'org.mockito:mockito-core:1.9.5', "org.springframework:spring-test:$springVersion", - 'org.easytesting:fest-assert:1.4', + "org.assertj:assertj-core:$assertjVersion", "org.springframework.security:spring-security-core:$springSecurityVersion" jacoco "org.jacoco:org.jacoco.agent:0.7.2.201409121644:runtime" diff --git a/spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java b/spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java index 347a5a09..3a9939e6 100644 --- a/spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java +++ b/spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.data.redis; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import java.util.Map; import java.util.UUID; @@ -96,7 +96,7 @@ public class RedisOperationsSessionRepositoryITests { assertThat(repository.getSession(toSave.getId())).isNull(); assertThat(registry.getEvent()).isInstanceOf(SessionDestroyedEvent.class); - assertThat(redis.boundSetOps(usernameSessionKey).members()).excludes(toSave.getId()); + assertThat(redis.boundSetOps(usernameSessionKey).members()).doesNotContain(toSave.getId()); assertThat(registry.getEvent().getSession().getAttribute(expectedAttributeName)).isEqualTo(expectedAttributeValue); @@ -142,7 +142,7 @@ public class RedisOperationsSessionRepositoryITests { findByPrincipalName = repository.findByPrincipalName(principalName); assertThat(findByPrincipalName).hasSize(0); - assertThat(findByPrincipalName.keySet()).excludes(toSave.getId()); + assertThat(findByPrincipalName.keySet()).doesNotContain(toSave.getId()); } @Configuration diff --git a/spring-session/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java b/spring-session/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java index 2097ae63..8fe6ddfc 100644 --- a/spring-session/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java +++ b/spring-session/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java @@ -16,7 +16,7 @@ package org.springframework.session.data.redis.config.annotation.web.http; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; diff --git a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastRepositoryITests.java b/spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastRepositoryITests.java index a3b821f7..c6150b51 100644 --- a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastRepositoryITests.java +++ b/spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastRepositoryITests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.hazelcast; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java b/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java index 63fc4f85..aabb817f 100644 --- a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java +++ b/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.hazelcast.config.annotation.web.http; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; diff --git a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java b/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java index 36032d89..6838dbf0 100644 --- a/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java +++ b/spring-session/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationXmlTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.hazelcast.config.annotation.web.http; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-session/src/test/java/org/springframework/session/MapSessionRepositoryTests.java b/spring-session/src/test/java/org/springframework/session/MapSessionRepositoryTests.java index cdfa2da6..da15f14e 100644 --- a/spring-session/src/test/java/org/springframework/session/MapSessionRepositoryTests.java +++ b/spring-session/src/test/java/org/springframework/session/MapSessionRepositoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import java.util.concurrent.TimeUnit; diff --git a/spring-session/src/test/java/org/springframework/session/MapSessionTests.java b/spring-session/src/test/java/org/springframework/session/MapSessionTests.java index 811c9cbd..9ffdfd3a 100644 --- a/spring-session/src/test/java/org/springframework/session/MapSessionTests.java +++ b/spring-session/src/test/java/org/springframework/session/MapSessionTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import java.util.Set; diff --git a/spring-session/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java b/spring-session/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java index d7f84c35..339d4ad7 100644 --- a/spring-session/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java +++ b/spring-session/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.config.annotation.web.http; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/spring-session/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java b/spring-session/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java index ab62e011..295c7081 100644 --- a/spring-session/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java +++ b/spring-session/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.data.redis; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.never; diff --git a/spring-session/src/test/java/org/springframework/session/data/redis/SessionMessageListenerTests.java b/spring-session/src/test/java/org/springframework/session/data/redis/SessionMessageListenerTests.java index d97c724f..e4347772 100644 --- a/spring-session/src/test/java/org/springframework/session/data/redis/SessionMessageListenerTests.java +++ b/spring-session/src/test/java/org/springframework/session/data/redis/SessionMessageListenerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.data.redis; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.UnsupportedEncodingException; diff --git a/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisKeyspaceNotificationsInitializerTests.java b/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisKeyspaceNotificationsInitializerTests.java index c1ffe262..6fbfaff2 100644 --- a/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisKeyspaceNotificationsInitializerTests.java +++ b/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisKeyspaceNotificationsInitializerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.data.redis.config.annotation.web.http; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; diff --git a/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideDefaultSerializerTests.java b/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideDefaultSerializerTests.java index 2c42502b..0306ca4e 100644 --- a/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideDefaultSerializerTests.java +++ b/spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideDefaultSerializerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.data.redis.config.annotation.web.http; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Test; diff --git a/spring-session/src/test/java/org/springframework/session/web/http/CookieHttpSessionStrategyTests.java b/spring-session/src/test/java/org/springframework/session/web/http/CookieHttpSessionStrategyTests.java index 43942efc..f0668a04 100644 --- a/spring-session/src/test/java/org/springframework/session/web/http/CookieHttpSessionStrategyTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/http/CookieHttpSessionStrategyTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.web.http; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import org.junit.Before; import org.junit.Test; diff --git a/spring-session/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java b/spring-session/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java index b9cc5363..87e0559c 100644 --- a/spring-session/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.web.http; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import javax.servlet.http.Cookie; diff --git a/spring-session/src/test/java/org/springframework/session/web/http/HeaderSessionStrategyTests.java b/spring-session/src/test/java/org/springframework/session/web/http/HeaderSessionStrategyTests.java index b154cc42..bc239766 100644 --- a/spring-session/src/test/java/org/springframework/session/web/http/HeaderSessionStrategyTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/http/HeaderSessionStrategyTests.java @@ -23,7 +23,7 @@ import org.springframework.session.MapSession; import org.springframework.session.Session; import org.springframework.session.web.http.HeaderHttpSessionStrategy; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; public class HeaderSessionStrategyTests { private MockHttpServletRequest request; diff --git a/spring-session/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java b/spring-session/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java index b7e7f550..b82f5f6c 100644 --- a/spring-session/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java @@ -28,7 +28,7 @@ import org.mockito.runners.MockitoJUnitRunner; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/spring-session/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java b/spring-session/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java index bb90e5cd..18a43bcb 100644 --- a/spring-session/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java @@ -32,7 +32,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; public class OncePerRequestFilterTests { private MockHttpServletRequest request; diff --git a/spring-session/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java b/spring-session/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java index d33af344..11fbd980 100644 --- a/spring-session/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.web.http; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Arrays; diff --git a/spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java b/spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java index e8ef0ee4..e301bd20 100644 --- a/spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.web.http; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; diff --git a/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java b/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java index cb63d0bd..7e84512c 100644 --- a/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.web.socket.handler; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Before; diff --git a/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java b/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java index bde02b2a..47769247 100644 --- a/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.web.socket.handler; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java b/spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java index 8ab897ba..b1979559 100644 --- a/spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java +++ b/spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java @@ -15,7 +15,7 @@ */ package org.springframework.session.web.socket.server; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*;