From 40f50498b2c33baff2ee8dc5bccbb05c63ed779d Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Fri, 16 Dec 2005 18:26:23 +0000 Subject: [PATCH] Re-enable some tests which partially work with embedded ApacheDS. --- .../FilterBasedLdapUserSearchTests.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearchTests.java b/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearchTests.java index 29a5f21fa0..1c6648ae64 100644 --- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearchTests.java +++ b/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/FilterBasedLdapUserSearchTests.java @@ -37,13 +37,14 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapServerTestCase { public FilterBasedLdapUserSearchTests() { super(); } -/* + public void testBasicSearch() throws Exception { locator.setSearchBase("ou=people"); locator.setSearchFilter("(uid={0})"); locator.afterPropertiesSet(); LdapUserDetails bob = locator.searchForUser("bob"); - assertEquals("uid=bob,ou=people,"+ROOT_DN, bob.getDn()); + // name is wrong with embedded apacheDS +// assertEquals("uid=bob,ou=people,"+ROOT_DN, bob.getDn()); } public void testSubTreeSearchSucceeds() throws Exception { @@ -51,10 +52,10 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapServerTestCase { locator.setSearchFilter("(cn={0})"); locator.setSearchSubtree(true); locator.afterPropertiesSet(); - LdapUserDetails bob = locator.searchForUser("Ben Alex"); - assertEquals("uid=ben,ou=people,"+ROOT_DN, bob.getDn()); + LdapUserDetails ben = locator.searchForUser("Ben Alex"); +// assertEquals("uid=ben,ou=people,"+ROOT_DN, bob.getDn()); } - */ + public void testSearchForInvalidUserFails() { locator.setSearchBase("ou=people"); locator.setSearchFilter("(uid={0})"); @@ -78,14 +79,15 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapServerTestCase { } // Try some funny business with filters. - /* - public void testExtraFilterPartToExcludeBob() { + + public void testExtraFilterPartToExcludeBob() throws Exception { locator.setSearchBase("ou=people"); locator.setSearchFilter("(&(cn=*)(!(uid={0})))"); // Search for bob, get back ben... LdapUserDetails ben = locator.searchForUser("bob"); - assertEquals("uid=ben,ou=people,"+ROOT_DN, ben.getDn()); + String cn = (String)ben.getAttributes().get("cn").get(); + assertEquals("Ben Alex", cn); +// assertEquals("uid=ben,ou=people,"+ROOT_DN, ben.getDn()); } - */ }