Migrate from fest-assert to assertj

Fixes gh-338

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"

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;

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;

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;
 

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

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"

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;

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"

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

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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.*;

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;

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;

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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.*;