Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +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
Download Patch File Download Diff File Expand all files Collapse all files
ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java
+7 -6
View File
@@ -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
ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java
+5 -4
View File
@@ -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