1
0
mirror of synced 2026-08-05 09:47:05 +00:00

Add support to subclass of GrantedAuthority in SecurityMockMvcResultMatchers withAuthorities (#3793)

SecurityMockMvcResultMatchers.withAuthorities(Collection<? extends GrantedAuthority>)

Fixes gh-3791
This commit is contained in:
Eddú Meléndez Gonzales
2016-04-08 23:55:53 +10:00
committed by Rob Winch
parent d05fe8ec07
commit a5a5d9a1a9
2 changed files with 99 additions and 2 deletions
@@ -36,6 +36,7 @@ import org.springframework.test.web.servlet.ResultMatcher;
* Security related {@link MockMvc} {@link ResultMatcher}s.
*
* @author Rob Winch
* @author Eddú Meléndez
* @since 4.0
*/
public final class SecurityMockMvcResultMatchers {
@@ -84,7 +85,7 @@ public final class SecurityMockMvcResultMatchers {
private Authentication expectedAuthentication;
private Object expectedAuthenticationPrincipal;
private String expectedAuthenticationName;
private Collection<GrantedAuthority> expectedGrantedAuthorities;
private Collection<? extends GrantedAuthority> expectedGrantedAuthorities;
public void match(MvcResult result) throws Exception {
SecurityContext context = load(result);
@@ -194,7 +195,7 @@ public final class SecurityMockMvcResultMatchers {
* @param expected the {@link Authentication#getAuthorities()}
* @return the {@link AuthenticatedMatcher} for further customization
*/
public AuthenticatedMatcher withAuthorities(Collection<GrantedAuthority> expected) {
public AuthenticatedMatcher withAuthorities(Collection<? extends GrantedAuthority> expected) {
this.expectedGrantedAuthorities = expected;
return this;
}