SEC-619: Added test class for LdapUserDetailsService. The LdapAuthoritiesPopulator interface and also implementations have been moved to the org.springframework.security.ldap package since they are now used by both the ldap provider and the user service.

core/src/test/java/org/springframework/security/ldap/MockSpringSecurityContextSource.java

@@ -34,6 +34,9 @@ public class MockSpringSecurityContextSource implements SpringSecurityContextSou
 
     //~ Constructors ===================================================================================================
 
+    public MockSpringSecurityContextSource() {
+    }
+
     public MockSpringSecurityContextSource(DirContext ctx, String baseDn) {
         this.baseDn = baseDn;
         this.ctx = ctx;

core/src/test/java/org/springframework/security/ldap/populator/DefaultLdapAuthoritiesPopulatorTests.java

@@ -13,11 +13,12 @@
  * limitations under the License.
  */
 
-package org.springframework.security.providers.ldap.populator;
+package org.springframework.security.ldap.populator;
 
 import org.springframework.security.GrantedAuthority;
 
 import org.springframework.security.ldap.AbstractLdapIntegrationTests;
+import org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator;
 
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;

core/src/test/java/org/springframework/security/providers/ldap/LdapAuthenticationProviderTests.java

@@ -15,21 +15,20 @@
 
 package org.springframework.security.providers.ldap;
 
-import junit.framework.TestCase;
-
+import org.springframework.security.Authentication;
 import org.springframework.security.BadCredentialsException;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.Authentication;
-
+import org.springframework.security.ldap.LdapAuthoritiesPopulator;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
-
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.ldap.LdapUserDetailsMapper;
-import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.DistinguishedName;
 
+import junit.framework.TestCase;
+
 import java.util.ArrayList;
 
 

core/src/test/java/org/springframework/security/providers/ldap/authenticator/MockUserSearch.java

@@ -33,6 +33,9 @@ public class MockUserSearch implements LdapUserSearch {
 
     //~ Constructors ===================================================================================================
 
+    public MockUserSearch() {
+    }
+
     public MockUserSearch(DirContextOperations user) {
         this.user = user;
     }

core/src/test/java/org/springframework/security/userdetails/ldap/LdapUserDetailsServiceTests.java

@@ -0,0 +1,56 @@
+package org.springframework.security.userdetails.ldap;
+
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.ldap.LdapAuthoritiesPopulator;
+import org.springframework.security.providers.ldap.authenticator.MockUserSearch;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.util.AuthorityUtils;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.DistinguishedName;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+import java.util.Set;
+
+/**
+ * Tests for {@link LdapUserDetailsService}
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ */
+public class LdapUserDetailsServiceTests {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void rejectsNullSearchObject() {
+        new LdapUserDetailsService(null, new MockAuthoritiesPopulator());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void rejectsNullAuthoritiesPopulator() {
+        new LdapUserDetailsService(new MockUserSearch(), null);
+    }
+
+    @Test
+    public void correctAuthoritiesAreReturned() {
+        DirContextAdapter userData = new DirContextAdapter(new DistinguishedName("uid=joe"));
+
+        LdapUserDetailsService service =
+                new LdapUserDetailsService(new MockUserSearch(userData), new MockAuthoritiesPopulator());
+        service.setUserDetailsMapper(new LdapUserDetailsMapper());
+
+        UserDetails user = service.loadUserByUsername("doesntmatterwegetjoeanyway");
+
+        Set authorities = AuthorityUtils.authorityArrayToSet(user.getAuthorities());
+        assertEquals(1, authorities.size());
+        assertTrue(authorities.contains("ROLE_FROM_POPULATOR"));
+    }
+
+    class MockAuthoritiesPopulator implements LdapAuthoritiesPopulator {
+        public GrantedAuthority[] getGrantedAuthorities(DirContextOperations userCtx, String username) {
+            return new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_FROM_POPULATOR")};
+        }
+    }
+}