Migrate from fest-assert to assertj

Fixes gh-338
This commit is contained in:
Rob Winch
2016-01-25 19:41:54 -06:00
parent 1003821dad
commit 5dff0ff37b
30 changed files with 32 additions and 32 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

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