Removal of some unused internal methods, plus additional tests for some areas lacking coverage.

ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java

@@ -53,7 +53,7 @@ public class PasswordPolicyAwareContextSource extends DefaultSpringSecurityConte
             PasswordPolicyResponseControl ctrl = PasswordPolicyControlExtractor.extractControl(ctx);
             if (debug) {
                 logger.debug("Failed to obtain context", ne);
-                logger.debug("Pasword policy response: " + ctrl);
+                logger.debug("Password policy response: " + ctrl);
             }
 
             LdapUtils.closeContext(ctx);

ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java

@@ -0,0 +1,62 @@
+package org.springframework.security.ldap.ppolicy;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.*;
+
+import org.junit.*;
+import org.springframework.ldap.UncategorizedLdapException;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.LdapContext;
+import java.util.*;
+
+/**
+ * @author Luke Taylor
+ */
+public class PasswordPolicyAwareContextSourceTests {
+    private PasswordPolicyAwareContextSource ctxSource;
+    private final LdapContext ctx = mock(LdapContext.class);
+
+    @Before
+    public void setUp() throws Exception {
+        reset(ctx);
+        ctxSource = new PasswordPolicyAwareContextSource("ldap://blah:789/dc=springframework,dc=org") {
+            @Override
+            protected DirContext createContext(Hashtable env) {
+                if ("manager".equals(env.get(Context.SECURITY_PRINCIPAL))) {
+                    return ctx;
+                }
+
+                return null;
+            }
+        };
+        ctxSource.setUserDn("manager");
+        ctxSource.setPassword("password");
+        ctxSource.afterPropertiesSet();
+    }
+
+    @Test
+    public void contextIsReturnedWhenNoControlsAreSetAndReconnectIsSuccessful() throws Exception {
+        assertNotNull(ctxSource.getContext("user", "ignored"));
+    }
+
+    @Test(expected=UncategorizedLdapException.class)
+    public void standardExceptionIsPropagatedWhenExceptionRaisedAndNoControlsAreSet() throws Exception {
+        doThrow(new NamingException("some LDAP exception")).when(ctx).reconnect(any(Control[].class));
+
+        ctxSource.getContext("user", "ignored");
+    }
+
+    @Test(expected=PasswordPolicyException.class)
+    public void lockedPasswordPolicyControlRaisesPasswordPolicyException() throws Exception {
+        when(ctx.getResponseControls()).thenReturn(new Control[] {
+                new PasswordPolicyResponseControl(PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL) });
+
+        doThrow(new NamingException("locked message")).when(ctx).reconnect(any(Control[].class));
+
+        ctxSource.getContext("user", "ignored");
+    }
+}

ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactoryTests.java

@@ -0,0 +1,36 @@
+package org.springframework.security.ldap.ppolicy;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.*;
+
+import javax.naming.ldap.Control;
+import java.util.*;
+
+/**
+ * @author Luke Taylor
+ */
+public class PasswordPolicyControlFactoryTests {
+
+    @Test
+    public void returnsNullForUnrecognisedOID() throws Exception {
+        PasswordPolicyControlFactory ctrlFactory = new PasswordPolicyControlFactory();
+        Control wrongCtrl = mock(Control.class);
+
+        when(wrongCtrl.getID()).thenReturn("wrongId");
+        assertNull(ctrlFactory.getControlInstance(wrongCtrl));
+    }
+
+    @Test
+    public void returnsControlForCorrectOID() throws Exception {
+        PasswordPolicyControlFactory ctrlFactory = new PasswordPolicyControlFactory();
+        Control control = mock(Control.class);
+
+        when(control.getID()).thenReturn(PasswordPolicyControl.OID);
+        when(control.getEncodedValue()).thenReturn(PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL);
+        Control result = ctrlFactory.getControlInstance(control);
+        assertNotNull(result);
+        assertTrue(Arrays.equals(PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL, result.getEncodedValue()));
+    }
+}

ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java

@@ -15,14 +15,19 @@
 
 package org.springframework.security.ldap.ppolicy;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import javax.naming.ldap.Control;
+import java.util.*;
 
 /**
  * Tests for <tt>PasswordPolicyResponse</tt>.
  *
  * @author Luke Taylor
  */
-public class PasswordPolicyResponseControlTests extends TestCase {
+public class PasswordPolicyResponseControlTests {
     //~ Methods ========================================================================================================
 
     /**
@@ -76,7 +81,8 @@ public class PasswordPolicyResponseControlTests extends TestCase {
 //        return null;
 //    }
 
-    public void testOpenLDAP33SecondsTillPasswordExpiryCtrlIsParsedCorrectly() {
+    @Test
+    public void openLDAP33SecondsTillPasswordExpiryCtrlIsParsedCorrectly() {
         byte[] ctrlBytes = {0x30, 0x05, (byte) 0xA0, 0x03, (byte) 0xA0, 0x1, 0x21};
 
         PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
@@ -85,7 +91,8 @@ public class PasswordPolicyResponseControlTests extends TestCase {
         assertEquals(33, ctrl.getTimeBeforeExpiration());
     }
 
-    public void testOpenLDAP496GraceLoginsRemainingCtrlIsParsedCorrectly() {
+    @Test
+    public void openLDAP496GraceLoginsRemainingCtrlIsParsedCorrectly() {
         byte[] ctrlBytes = {0x30, 0x06, (byte) 0xA0, 0x04, (byte) 0xA1, 0x02, 0x01, (byte) 0xF0};
 
         PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
@@ -94,25 +101,28 @@ public class PasswordPolicyResponseControlTests extends TestCase {
         assertEquals(496, ctrl.getGraceLoginsRemaining());
     }
 
-    public void testOpenLDAP5GraceLoginsRemainingCtrlIsParsedCorrectly() {
-        byte[] ctrlBytes = {0x30, 0x05, (byte) 0xA0, 0x03, (byte) 0xA1, 0x01, 0x05};
+    static final byte[] OPENLDAP_5_LOGINS_REMAINING_CTRL = {0x30, 0x05, (byte) 0xA0, 0x03, (byte) 0xA1, 0x01, 0x05};
 
-        PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
+    @Test
+    public void openLDAP5GraceLoginsRemainingCtrlIsParsedCorrectly() {
+        PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(OPENLDAP_5_LOGINS_REMAINING_CTRL);
 
         assertTrue(ctrl.hasWarning());
         assertEquals(5, ctrl.getGraceLoginsRemaining());
     }
 
-    public void testOpenLDAPAccountLockedCtrlIsParsedCorrectly() {
-        byte[] ctrlBytes = {0x30, 0x03, (byte) 0xA1, 0x01, 0x01};
+    static final byte[] OPENLDAP_LOCKED_CTRL = {0x30, 0x03, (byte) 0xA1, 0x01, 0x01};
 
-        PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
+    @Test
+    public void openLDAPAccountLockedCtrlIsParsedCorrectly() {
+        PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(OPENLDAP_LOCKED_CTRL);
 
         assertTrue(ctrl.hasError() && ctrl.isLocked());
         assertFalse(ctrl.hasWarning());
     }
 
-    public void testOpenLDAPPasswordExpiredCtrlIsParsedCorrectly() {
+    @Test
+    public void openLDAPPasswordExpiredCtrlIsParsedCorrectly() {
         byte[] ctrlBytes = {0x30, 0x03, (byte) 0xA1, 0x01, 0x00};
 
         PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);