diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java index 18e7748429..9371cd11c5 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java @@ -15,11 +15,12 @@ */ package org.springframework.security.config.ldap; -import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.*; -import static org.springframework.security.config.ldap.LdapUserServiceBeanDefinitionParser.*; +import java.util.Set; + +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.core.authority.AuthorityUtils; 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.Person; 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 Rob Winch + * @author Eddú Meléndez */ public class LdapUserServiceBeanDefinitionParserTests { private InMemoryXmlApplicationContext appCtx; @@ -102,13 +109,11 @@ public class LdapUserServiceBeanDefinitionParserTests { UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS"); UserDetails ben = uds.loadUserByUsername("ben"); - assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains( - "PREFIX_DEVELOPERS")); + assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities())).contains("PREFIX_DEVELOPERS"); uds = (UserDetailsService) appCtx.getBean("ldapUDSNoPrefix"); ben = uds.loadUserByUsername("ben"); - assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains( - "DEVELOPERS")); + assertThat(AuthorityUtils.authorityListToSet(ben.getAuthorities())).contains("DEVELOPERS"); } @Test diff --git a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java index 2a06e27db9..38960e5484 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java @@ -15,29 +15,29 @@ */ 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.Test; +import org.w3c.dom.Element; + import org.springframework.security.authentication.AuthenticationManager; 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.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.core.authority.AuthorityUtils; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.provisioning.JdbcUserDetailsManager; 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 Luke Taylor + * @author Eddú Meléndez */ public class JdbcUserServiceBeanDefinitionParserTests { private static String USER_CACHE_XML = ""; @@ -154,8 +154,8 @@ public class JdbcUserServiceBeanDefinitionParserTests { JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext .getBean("myUserService"); UserDetails rod = mgr.loadUserByUsername("rod"); - assertThat(AuthorityUtils.authorityListToSet(rod.getAuthorities()).contains( - "PREFIX_ROLE_SUPERVISOR")); + assertThat(AuthorityUtils.authorityListToSet(rod.getAuthorities())) + .contains("PREFIX_ROLE_SUPERVISOR"); } private void setContext(String context) { diff --git a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java index 9c05e2698e..216ecb0b45 100644 --- a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java @@ -72,10 +72,8 @@ public class UsernamePasswordAuthenticationTokenTests { AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO")); assertThat(token.getPrincipal()).isEqualTo("Test"); assertThat(token.getCredentials()).isEqualTo("Password"); - assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( - "ROLE_ONE")); - assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( - "ROLE_TWO")); + assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities())).contains("ROLE_ONE"); + assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities())).contains("ROLE_TWO"); } @Test(expected = NoSuchMethodException.class) diff --git a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java index ae7bb99d37..f7b51ba661 100644 --- a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java @@ -89,8 +89,7 @@ public class RemoteAuthenticationProviderTests { .authenticate(new UsernamePasswordAuthenticationToken("rod", "password")); assertThat(result.getPrincipal()).isEqualTo("rod"); assertThat(result.getCredentials()).isEqualTo("password"); - assertThat(AuthorityUtils.authorityListToSet(result.getAuthorities()) - .contains("foo")); + assertThat(AuthorityUtils.authorityListToSet(result.getAuthorities())).contains("foo"); } @Test diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java index 15991884ef..2d4e28d790 100644 --- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java @@ -86,10 +86,8 @@ public class RememberMeAuthenticationTokenTests { assertThat(token.getKeyHash()).isEqualTo("key".hashCode()); assertThat(token.getPrincipal()).isEqualTo("Test"); assertThat(token.getCredentials()).isEqualTo(""); - assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( - "ROLE_ONE")); - assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains( - "ROLE_TWO")); + assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities())).contains("ROLE_ONE"); + assertThat(AuthorityUtils.authorityListToSet(token.getAuthorities())).contains("ROLE_TWO"); assertThat(token.isAuthenticated()).isTrue(); } diff --git a/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java index 9e85368fb6..6ae95f12cc 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java @@ -16,8 +16,6 @@ package org.springframework.security.core.userdetails.jdbc; -import static org.assertj.core.api.Assertions.*; - import org.junit.Test; 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.UsernameNotFoundException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * Tests {@link JdbcDaoImpl}. * * @author Ben Alex + * @author Eddú Meléndez */ public class JdbcDaoImplTests { @@ -60,10 +62,10 @@ public class JdbcDaoImplTests { assertThat(user.getPassword()).isEqualTo("koala"); assertThat(user.isEnabled()).isTrue(); - assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( - "ROLE_TELLER")); - assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( - "ROLE_SUPERVISOR")); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())) + .contains("ROLE_TELLER"); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())) + .contains("ROLE_SUPERVISOR"); } @Test @@ -71,8 +73,8 @@ public class JdbcDaoImplTests { JdbcDaoImpl dao = makePopulatedJdbcDao(); UserDetails user = dao.loadUserByUsername("scott"); assertThat(user.getAuthorities()).hasSize(1); - assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( - "ROLE_TELLER")); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())) + .contains("ROLE_TELLER"); } @Test @@ -133,10 +135,10 @@ public class JdbcDaoImplTests { assertThat(user.getUsername()).isEqualTo("rod"); assertThat(user.getAuthorities()).hasSize(2); - assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( - "ARBITRARY_PREFIX_ROLE_TELLER")); - assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( - "ARBITRARY_PREFIX_ROLE_SUPERVISOR")); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())) + .contains("ARBITRARY_PREFIX_ROLE_TELLER"); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())) + .contains("ARBITRARY_PREFIX_ROLE_SUPERVISOR"); } @Test diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java index 45c03848a4..9ee250b494 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java @@ -42,6 +42,7 @@ import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper; * * @author Luke Taylor * @author Rob Winch + * @author Eddú Meléndez */ public class LdapAuthenticationProviderTests { @@ -137,10 +138,10 @@ public class LdapAuthenticationProviderTests { assertThat(user.getUsername()).isEqualTo("ben"); assertThat(populator.getRequestedUsername()).isEqualTo("ben"); - assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( - "ROLE_FROM_ENTRY")); - assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( - "ROLE_FROM_POPULATOR")); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())) + .contains("ROLE_FROM_ENTRY"); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())) + .contains("ROLE_FROM_POPULATOR"); } @Test @@ -168,8 +169,8 @@ public class LdapAuthenticationProviderTests { UserDetails user = (UserDetails) ldapProvider.authenticate(authRequest) .getPrincipal(); assertThat(user.getAuthorities()).hasSize(1); - assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( - "ROLE_FROM_ENTRY")); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())) + .contains("ROLE_FROM_ENTRY"); } @Test diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java index 5965b170f6..f3bb18061d 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java @@ -16,20 +16,22 @@ package org.springframework.security.ldap.userdetails; -import static org.assertj.core.api.Assertions.assertThat; - import javax.naming.directory.BasicAttribute; import javax.naming.directory.BasicAttributes; import org.junit.Test; + import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DistinguishedName; import org.springframework.security.core.authority.AuthorityUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests {@link LdapUserDetailsMapper}. * * @author Luke Taylor + * @author Eddú Meléndez */ public class LdapUserDetailsMapperTests { @@ -72,8 +74,7 @@ public class LdapUserDetailsMapperTests { "ani", AuthorityUtils.NO_AUTHORITIES); assertThat(user.getAuthorities()).hasSize(1); - assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains( - "ROLE_X")); + assertThat(AuthorityUtils.authorityListToSet(user.getAuthorities())).contains("ROLE_X"); } @Test diff --git a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java index 228c20fe61..f9df8ad2bd 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java @@ -16,10 +16,19 @@ package org.springframework.security.web.authentication; -import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.*; +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import org.junit.*; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.security.authentication.TestingAuthenticationToken; @@ -27,18 +36,15 @@ 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.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import java.io.IOException; +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}. * * @author Ben Alex + * @author Eddú Meléndez */ public class AnonymousAuthenticationFilterTests { @@ -103,8 +109,7 @@ public class AnonymousAuthenticationFilterTests { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); assertThat(auth.getPrincipal()).isEqualTo("anonymousUsername"); - assertThat(AuthorityUtils.authorityListToSet(auth.getAuthorities()).contains( - "ROLE_ANONYMOUS")); + assertThat(AuthorityUtils.authorityListToSet(auth.getAuthorities())).contains("ROLE_ANONYMOUS"); SecurityContextHolder.getContext().setAuthentication(null); // so anonymous fires // again }