Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove MatcherAssertionErrors 

Spring 5 removes MatcherAssertionErrors. We should not have been using
this class anyways.

This commit updates to using assertj in favor of MatcherAssertionErrors.

Issue gh-4080
This commit is contained in:
Rob Winch 2016-10-17 09:33:26 -05:00
parent 8a7ac398e6
commit 2c99cd3bbf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java
View File

@ -22,8 +22,8 @@ import org.springframework.security.web.header.writers.frameoptions.WhiteListedA
import java.util.ArrayList;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
/**
* Test for the {@code WhiteListedAllowFromStrategy}.
@ -53,7 +53,7 @@ public class WhiteListedAllowFromStrategyTests {
request.setParameter("from", "http://www.test.com");
String result = strategy.getAllowFromValue(request);
assertThat(result, is("http://www.test.com"));
assertThat(result).isEqualTo("http://www.test.com");
}
@Test
@ -67,7 +67,7 @@ public class WhiteListedAllowFromStrategyTests {
request.setParameter("from", "http://www.test.com");
String result = strategy.getAllowFromValue(request);
assertThat(result, is("http://www.test.com"));
assertThat(result).isEqualTo("http://www.test.com");
}
@Test
@ -80,7 +80,7 @@ public class WhiteListedAllowFromStrategyTests {
request.setParameter("from", "http://www.test123.com");
String result = strategy.getAllowFromValue(request);
assertThat(result, is("DENY"));
assertThat(result).isEqualTo("DENY");
}
@Test
@ -92,7 +92,7 @@ public class WhiteListedAllowFromStrategyTests {
MockHttpServletRequest request = new MockHttpServletRequest();
String result = strategy.getAllowFromValue(request);
assertThat(result, is("DENY"));
assertThat(result).isEqualTo("DENY");
}