1
0
mirror of synced 2026-08-03 08:51:58 +00:00

Start AssertJ Migration

Issue gh-3175
This commit is contained in:
Rob Winch
2015-12-16 10:38:31 -06:00
parent 6cbb439701
commit bb600a473e
355 changed files with 3036 additions and 3133 deletions
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context.annotation;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context.showcase;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context.showcase;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context.support;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.*;
import org.junit.Before;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context.support;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.springframework.core.annotation.AnnotationUtils;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context.support;
import static org.fest.assertions.Assertions.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.when;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context.support;
import static org.fest.assertions.Assertions.*;
import static org.assertj.core.api.Assertions.*;
import java.util.ArrayList;
import java.util.List;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context.support;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
import org.junit.Before;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.context.support;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.springframework.core.annotation.AnnotationUtils;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.web.servlet.request;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin;
import org.junit.Before;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.web.servlet.request;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.logout;
import org.junit.Before;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.web.servlet.request;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
@@ -24,7 +24,7 @@ import org.springframework.mock.web.MockHttpServletRequest;
import java.security.cert.X509Certificate;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.x509;
@RunWith(MockitoJUnitRunner.class)
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.web.servlet.request;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -36,7 +36,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import java.io.IOException;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.digest;
public class SecurityMockMvcRequestPostProcessorsDigestTests {
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.web.servlet.request;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.web.servlet.request;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.web.servlet.request;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
@@ -15,7 +15,7 @@
*/
package org.springframework.security.test.web.support;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.security.test.web.support.WebTestUtils.getCsrfTokenRepository;
import static org.springframework.security.test.web.support.WebTestUtils.getSecurityContextRepository;