diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulator.java b/core/src/main/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulator.java index eab2b87898..195125e798 100644 --- a/core/src/main/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulator.java +++ b/core/src/main/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulator.java @@ -139,15 +139,6 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator //~ Constructors =========================================================== - /** - * Constructor for non-group search scenarios. Typically in this case - * the userRoleAttributes property will be set to obtain roles directly - * from the user's directory entry attributes. The defaultRole property - * may also be set and will be assigned to all users. - */ - public DefaultLdapAuthoritiesPopulator() { - } - /** * Constructor for group search scenarios. userRoleAttributes may still be * set as a property. diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java b/core/src/test/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java index 57f400ad26..5c3199a7a3 100644 --- a/core/src/test/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java +++ b/core/src/test/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java @@ -44,11 +44,11 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapServerTest // } public void testDefaultRoleIsAssignedWhenSet() { - DefaultLdapAuthoritiesPopulator populator = new DefaultLdapAuthoritiesPopulator(); + DefaultLdapAuthoritiesPopulator populator = new DefaultLdapAuthoritiesPopulator(getInitialCtxFactory(), "ou=groups"); populator.setDefaultRole("ROLE_USER"); LdapUserDetailsImpl.Essence user = new LdapUserDetailsImpl.Essence(); - user.setDn("Ignored"); - user.setUsername("Ignored"); + user.setDn("cn=notfound"); + user.setUsername("notfound"); user.setAttributes(new BasicAttributes()); GrantedAuthority[] authorities = @@ -57,7 +57,7 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapServerTest assertEquals("ROLE_USER", authorities[0].getAuthority()); } - public void testGroupSearch() throws Exception { + public void testGroupSearchReturnsExpectedRoles() { DefaultLdapAuthoritiesPopulator populator = new DefaultLdapAuthoritiesPopulator(getInitialCtxFactory(), "ou=groups"); populator.setRolePrefix("ROLE_");