Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-01 09:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test assertions

Browse Source
This commit is contained in:
Eddú Meléndez 2016-07-02 22:23:25 +10:00 committed by Rob Winch
parent b4ab0483b1
commit 13b0ddb7e6
9 changed files with 74 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java
View File

@ -15,11 +15,12 @@
*/ */
package org.springframework.security.config.ldap; package org.springframework.security.config.ldap;
import static org.assertj.core.api.Assertions.*; import java.util.Set;
import static org.mockito.Mockito.*;
import static org.springframework.security.config.ldap.LdapUserServiceBeanDefinitionParser.*; import org.junit.After;
import org.junit.Test;
import org.w3c.dom.Element;
import org.junit.*;
import org.springframework.security.config.util.InMemoryXmlApplicationContext; import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
@ -32,13 +33,19 @@ import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
import org.springframework.security.ldap.userdetails.LdapUserDetailsService; import org.springframework.security.ldap.userdetails.LdapUserDetailsService;
import org.springframework.security.ldap.userdetails.Person; import org.springframework.security.ldap.userdetails.Person;
import org.springframework.security.ldap.userdetails.PersonContextMapper; import org.springframework.security.ldap.userdetails.PersonContextMapper;
import org.w3c.dom.Element;
import java.util.*; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.springframework.security.config.ldap.LdapUserServiceBeanDefinitionParser.INET_ORG_PERSON_MAPPER_CLASS;
import static org.springframework.security.config.ldap.LdapUserServiceBeanDefinitionParser.LDAP_AUTHORITIES_POPULATOR_CLASS;
import static org.springframework.security.config.ldap.LdapUserServiceBeanDefinitionParser.LDAP_SEARCH_CLASS;
import static org.springframework.security.config.ldap.LdapUserServiceBeanDefinitionParser.LDAP_USER_MAPPER_CLASS;
import static org.springframework.security.config.ldap.LdapUserServiceBeanDefinitionParser.PERSON_MAPPER_CLASS;
/** /**
* @author Luke Taylor * @author Luke Taylor
* @author Rob Winch * @author Rob Winch
* @author Eddú Meléndez
*/ */
public class LdapUserServiceBeanDefinitionParserTests { public class LdapUserServiceBeanDefinitionParserTests {
private InMemoryXmlApplicationContext appCtx; private InMemoryXmlApplicationContext appCtx;
@ -102,13 +109,11 @@ public class LdapUserServiceBeanDefinitionParserTests {
UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
UserDetails ben = uds.loadUserByUsername("ben"); UserDetails ben = uds.loadUserByUsername("ben");
assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities())).contains("PREFIX_DEVELOPERS");
"PREFIX_DEVELOPERS"));
uds = (UserDetailsService) appCtx.getBean("ldapUDSNoPrefix"); uds = (UserDetailsService) appCtx.getBean("ldapUDSNoPrefix");
ben = uds.loadUserByUsername("ben"); ben = uds.loadUserByUsername("ben");
assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities())).contains("DEVELOPERS");
"DEVELOPERS"));
} }
@Test @Test

20
config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java
View File

@ -15,29 +15,29 @@
*/ */
package org.springframework.security.config.authentication; package org.springframework.security.config.authentication;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.w3c.dom.Element;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.ProviderManager; import org.springframework.security.authentication.ProviderManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication
.UsernamePasswordAuthenticationToken;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.config.BeanIds; import org.springframework.security.config.BeanIds;
import org.springframework.security.config.authentication.AbstractUserDetailsServiceBeanDefinitionParser;
import org.springframework.security.config.authentication.CachingUserDetailsService;
import org.springframework.security.config.authentication.JdbcUserServiceBeanDefinitionParser;
import org.springframework.security.config.util.InMemoryXmlApplicationContext; import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.provisioning.JdbcUserDetailsManager; import org.springframework.security.provisioning.JdbcUserDetailsManager;
import org.springframework.security.util.FieldUtils; import org.springframework.security.util.FieldUtils;
import org.w3c.dom.Element;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
/** /**
* @author Ben Alex * @author Ben Alex
* @author Luke Taylor * @author Luke Taylor
* @author Eddú Meléndez
*/ */
public class JdbcUserServiceBeanDefinitionParserTests { public class JdbcUserServiceBeanDefinitionParserTests {
private static String USER_CACHE_XML = "<b:bean id='userCache' class='org.springframework.security.authentication.dao.MockUserCache'/>"; private static String USER_CACHE_XML = "<b:bean id='userCache' class='org.springframework.security.authentication.dao.MockUserCache'/>";
@ -154,8 +154,8 @@ public class JdbcUserServiceBeanDefinitionParserTests {
JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext
.getBean("myUserService"); .getBean("myUserService");
UserDetails rod = mgr.loadUserByUsername("rod"); UserDetails rod = mgr.loadUserByUsername("rod");
assertThat(AuthorityUtils.authorityListToSet(rod.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(rod.getAuthorities()))
"PREFIX_ROLE_SUPERVISOR")); .contains("PREFIX_ROLE_SUPERVISOR");
} }
private void setContext(String context) { private void setContext(String context) {

6
core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java
View File

@ -72,10 +72,8 @@ public class UsernamePasswordAuthenticationTokenTests {
AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO")); AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
assertThat(token.getPrincipal()).isEqualTo("Test"); assertThat(token.getPrincipal()).isEqualTo("Test");
assertThat(token.getCredentials()).isEqualTo("Password"); assertThat(token.getCredentials()).isEqualTo("Password");
assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities())).contains("ROLE_ONE");
"ROLE_ONE")); assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities())).contains("ROLE_TWO");
assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains(
"ROLE_TWO"));
} }
@Test(expected = NoSuchMethodException.class) @Test(expected = NoSuchMethodException.class)

3
core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java
View File

@ -89,8 +89,7 @@ public class RemoteAuthenticationProviderTests {
.authenticate(new UsernamePasswordAuthenticationToken("rod", "password")); .authenticate(new UsernamePasswordAuthenticationToken("rod", "password"));
assertThat(result.getPrincipal()).isEqualTo("rod"); assertThat(result.getPrincipal()).isEqualTo("rod");
assertThat(result.getCredentials()).isEqualTo("password"); assertThat(result.getCredentials()).isEqualTo("password");
assertThat(AuthorityUtils.authorityListToSet(result.getAuthorities()) assertThat(AuthorityUtils.authorityListToSet(result.getAuthorities())).contains("foo");
.contains("foo"));
} }
@Test @Test

6
core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java
View File

@ -86,10 +86,8 @@ public class RememberMeAuthenticationTokenTests {
assertThat(token.getKeyHash()).isEqualTo("key".hashCode()); assertThat(token.getKeyHash()).isEqualTo("key".hashCode());
assertThat(token.getPrincipal()).isEqualTo("Test"); assertThat(token.getPrincipal()).isEqualTo("Test");
assertThat(token.getCredentials()).isEqualTo(""); assertThat(token.getCredentials()).isEqualTo("");
assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities())).contains("ROLE_ONE");
"ROLE_ONE")); assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities())).contains("ROLE_TWO");
assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains(
"ROLE_TWO"));
assertThat(token.isAuthenticated()).isTrue(); assertThat(token.isAuthenticated()).isTrue();
} }

26
core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java
View File

@ -16,8 +16,6 @@
package org.springframework.security.core.userdetails.jdbc; package org.springframework.security.core.userdetails.jdbc;
import static org.assertj.core.api.Assertions.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.security.PopulatedDatabase; import org.springframework.security.PopulatedDatabase;
@ -25,10 +23,14 @@ import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.core.userdetails.UsernameNotFoundException;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
/** /**
* Tests {@link JdbcDaoImpl}. * Tests {@link JdbcDaoImpl}.
* *
* @author Ben Alex * @author Ben Alex
* @author Eddú Meléndez
*/ */
public class JdbcDaoImplTests { public class JdbcDaoImplTests {
@ -60,10 +62,10 @@ public class JdbcDaoImplTests {
assertThat(user.getPassword()).isEqualTo("koala"); assertThat(user.getPassword()).isEqualTo("koala");
assertThat(user.isEnabled()).isTrue(); assertThat(user.isEnabled()).isTrue();
assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()))
"ROLE_TELLER")); .contains("ROLE_TELLER");
assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()))
"ROLE_SUPERVISOR")); .contains("ROLE_SUPERVISOR");
} }
@Test @Test
@ -71,8 +73,8 @@ public class JdbcDaoImplTests {
JdbcDaoImpl dao = makePopulatedJdbcDao(); JdbcDaoImpl dao = makePopulatedJdbcDao();
UserDetails user = dao.loadUserByUsername("scott"); UserDetails user = dao.loadUserByUsername("scott");
assertThat(user.getAuthorities()).hasSize(1); assertThat(user.getAuthorities()).hasSize(1);
assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()))
"ROLE_TELLER")); .contains("ROLE_TELLER");
} }
@Test @Test
@ -133,10 +135,10 @@ public class JdbcDaoImplTests {
assertThat(user.getUsername()).isEqualTo("rod"); assertThat(user.getUsername()).isEqualTo("rod");
assertThat(user.getAuthorities()).hasSize(2); assertThat(user.getAuthorities()).hasSize(2);
assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()))
"ARBITRARY_PREFIX_ROLE_TELLER")); .contains("ARBITRARY_PREFIX_ROLE_TELLER");
assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()))
"ARBITRARY_PREFIX_ROLE_SUPERVISOR")); .contains("ARBITRARY_PREFIX_ROLE_SUPERVISOR");
} }
@Test @Test

13
ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java
View File

@ -42,6 +42,7 @@ import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
* *
* @author Luke Taylor * @author Luke Taylor
* @author Rob Winch * @author Rob Winch
* @author Eddú Meléndez
*/ */
public class LdapAuthenticationProviderTests { public class LdapAuthenticationProviderTests {
@ -137,10 +138,10 @@ public class LdapAuthenticationProviderTests {
assertThat(user.getUsername()).isEqualTo("ben"); assertThat(user.getUsername()).isEqualTo("ben");
assertThat(populator.getRequestedUsername()).isEqualTo("ben"); assertThat(populator.getRequestedUsername()).isEqualTo("ben");
assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()))
"ROLE_FROM_ENTRY")); .contains("ROLE_FROM_ENTRY");
assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()))
"ROLE_FROM_POPULATOR")); .contains("ROLE_FROM_POPULATOR");
} }
@Test @Test
@ -168,8 +169,8 @@ public class LdapAuthenticationProviderTests {
UserDetails user = (UserDetails) ldapProvider.authenticate(authRequest) UserDetails user = (UserDetails) ldapProvider.authenticate(authRequest)
.getPrincipal(); .getPrincipal();
assertThat(user.getAuthorities()).hasSize(1); assertThat(user.getAuthorities()).hasSize(1);
assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()))
"ROLE_FROM_ENTRY")); .contains("ROLE_FROM_ENTRY");
} }
@Test @Test

9
ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java
View File

@ -16,20 +16,22 @@
package org.springframework.security.ldap.userdetails; package org.springframework.security.ldap.userdetails;
import static org.assertj.core.api.Assertions.assertThat;
import javax.naming.directory.BasicAttribute; import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes; import javax.naming.directory.BasicAttributes;
import org.junit.Test; import org.junit.Test;
import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.DistinguishedName;
import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.authority.AuthorityUtils;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests {@link LdapUserDetailsMapper}. * Tests {@link LdapUserDetailsMapper}.
* *
* @author Luke Taylor * @author Luke Taylor
* @author Eddú Meléndez
*/ */
public class LdapUserDetailsMapperTests { public class LdapUserDetailsMapperTests {
@ -72,8 +74,7 @@ public class LdapUserDetailsMapperTests {
"ani", AuthorityUtils.NO_AUTHORITIES); "ani", AuthorityUtils.NO_AUTHORITIES);
assertThat(user.getAuthorities()).hasSize(1); assertThat(user.getAuthorities()).hasSize(1);
assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())).contains("ROLE_X");
"ROLE_X"));
} }
@Test @Test

31
web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java
View File

@ -16,16 +16,7 @@
package org.springframework.security.web.authentication; package org.springframework.security.web.authentication;
import static org.assertj.core.api.Assertions.*; import java.io.IOException;
import static org.mockito.Mockito.*;
import org.junit.*;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.context.SecurityContextHolder;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
@ -33,12 +24,27 @@ import javax.servlet.FilterConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import java.io.IOException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.context.SecurityContextHolder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.mockito.Mockito.mock;
/** /**
* Tests {@link AnonymousAuthenticationFilter}. * Tests {@link AnonymousAuthenticationFilter}.
* *
* @author Ben Alex * @author Ben Alex
* @author Eddú Meléndez
*/ */
public class AnonymousAuthenticationFilterTests { public class AnonymousAuthenticationFilterTests {
@ -103,8 +109,7 @@ public class AnonymousAuthenticationFilterTests {
Authentication auth = SecurityContextHolder.getContext().getAuthentication(); Authentication auth = SecurityContextHolder.getContext().getAuthentication();
assertThat(auth.getPrincipal()).isEqualTo("anonymousUsername"); assertThat(auth.getPrincipal()).isEqualTo("anonymousUsername");
assertThat(AuthorityUtils.authorityListToSet(auth.getAuthorities()).contains( assertThat(AuthorityUtils.authorityListToSet(auth.getAuthorities())).contains("ROLE_ANONYMOUS");
"ROLE_ANONYMOUS"));
SecurityContextHolder.getContext().setAuthentication(null); // so anonymous fires SecurityContextHolder.getContext().setAuthentication(null); // so anonymous fires
// again // again
} }