Re-enable some tests which partially work with embedded ApacheDS.

This commit is contained in:
Luke Taylor 2005-12-16 18:26:23 +00:00
parent 31be69be37
commit 40f50498b2
1 changed files with 11 additions and 9 deletions

View File

@ -37,13 +37,14 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapServerTestCase {
public FilterBasedLdapUserSearchTests() { public FilterBasedLdapUserSearchTests() {
super(); super();
} }
/*
public void testBasicSearch() throws Exception { public void testBasicSearch() throws Exception {
locator.setSearchBase("ou=people"); locator.setSearchBase("ou=people");
locator.setSearchFilter("(uid={0})"); locator.setSearchFilter("(uid={0})");
locator.afterPropertiesSet(); locator.afterPropertiesSet();
LdapUserDetails bob = locator.searchForUser("bob"); 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 { public void testSubTreeSearchSucceeds() throws Exception {
@ -51,10 +52,10 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapServerTestCase {
locator.setSearchFilter("(cn={0})"); locator.setSearchFilter("(cn={0})");
locator.setSearchSubtree(true); locator.setSearchSubtree(true);
locator.afterPropertiesSet(); locator.afterPropertiesSet();
LdapUserDetails bob = locator.searchForUser("Ben Alex"); LdapUserDetails ben = locator.searchForUser("Ben Alex");
assertEquals("uid=ben,ou=people,"+ROOT_DN, bob.getDn()); // assertEquals("uid=ben,ou=people,"+ROOT_DN, bob.getDn());
} }
*/
public void testSearchForInvalidUserFails() { public void testSearchForInvalidUserFails() {
locator.setSearchBase("ou=people"); locator.setSearchBase("ou=people");
locator.setSearchFilter("(uid={0})"); locator.setSearchFilter("(uid={0})");
@ -78,14 +79,15 @@ public class FilterBasedLdapUserSearchTests extends AbstractLdapServerTestCase {
} }
// Try some funny business with filters. // Try some funny business with filters.
/*
public void testExtraFilterPartToExcludeBob() { public void testExtraFilterPartToExcludeBob() throws Exception {
locator.setSearchBase("ou=people"); locator.setSearchBase("ou=people");
locator.setSearchFilter("(&(cn=*)(!(uid={0})))"); locator.setSearchFilter("(&(cn=*)(!(uid={0})))");
// Search for bob, get back ben... // Search for bob, get back ben...
LdapUserDetails ben = locator.searchForUser("bob"); 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());
} }
*/
} }