From f61a58d98ba23f092f93adbd4af5915cbcb7f78e Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sun, 16 Apr 2006 21:18:12 +0000
Subject: [PATCH] Added a couple more tests.

---
 .../authenticator/LdapShaPasswordEncoderTests.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java b/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java
index e4f35d14c9..b96228827c 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/LdapShaPasswordEncoderTests.java
@@ -36,6 +36,10 @@ public class LdapShaPasswordEncoderTests extends TestCase {
         assertTrue(sha.isPasswordValid("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", "boabspasswurd", null));
     }
 
+    public void testInvalidPasswordFails() {
+        assertFalse(sha.isPasswordValid("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", "wrongpassword", null));
+    }
+
     /** Test values generated by 'slappasswd -s boabspasswurd' */
     public void testValidSaltedPasswordSucceeds() {
         assertTrue(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgX", "boabspasswurd", null));
@@ -46,4 +50,11 @@ public class LdapShaPasswordEncoderTests extends TestCase {
         assertFalse(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgX", "wrongpassword", null));
         assertFalse(sha.isPasswordValid("{SSHA}PQy2j+6n5ytA+YlAKkM8Fh4p6u2JxfVd", "wrongpassword", null));
     }
+
+    public void testNonByteArraySaltThrowsException() {
+        try {
+            sha.encodePassword("password", "AStringNotAByteArray");
+        } catch(IllegalArgumentException expected) {
+        }
+    }
 }