Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved the control testing code to use lookup with attributes.

Browse Source
This commit is contained in:
Ulrik Sandberg
2007-09-03 22:44:33 +00:00
parent d20f937edc
commit e0d51e2e1a
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
spring-ldap/src/itest/java/org/springframework/ldap/control/SupportedControlsITest.java
View File

@@ -22,11 +22,9 @@ import java.util.LinkedList;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import org.springframework.ldap.AbstractLdapTemplateIntegrationTest;
import org.springframework.ldap.core.AttributesMapper;
import org.springframework.ldap.core.ContextExecutor;
import org.springframework.ldap.core.LdapTemplate;
/**
@@ -35,45 +33,30 @@ import org.springframework.ldap.core.LdapTemplate;
* @author Ulrik Sandberg
*/
public class SupportedControlsITest extends AbstractLdapTemplateIntegrationTest {
/** must use a context source that has no base set */
private LdapTemplate tested;
private static String SUPPORTED_CONTROL = "supportedcontrol";
private static final String SUPPORTED_CONTROL = "supportedcontrol";
protected String[] getConfigLocations() {
return new String[] { "/conf/ldapTemplateTestContext.xml" };
return new String[] { "/conf/rootContextSourceTestContext.xml" };
}
public void testExpectedControlsSupported() throws Exception {
final String name = "ldap://localhost:3900";
/**
* Maps the 'supportedcontrol' attribute to a string array.
*/
final AttributesMapper mapper = new AttributesMapper() {
public Object mapFromAttributes(Attributes attributes)
throws NamingException {
LinkedList list = new LinkedList();
NamingEnumeration enumeration = attributes.get(
SUPPORTED_CONTROL).getAll();
while (enumeration.hasMoreElements()) {
list.add((String) enumeration.nextElement());
}
return list.toArray(new String[0]);
}
};
/**
* Performs a 'getAttributes' operation and maps the result to a string
* array.
*/
ContextExecutor executor = new ContextExecutor() {
public Object executeWithContext(DirContext ctx)
throws NamingException {
Attributes attributes = ctx.getAttributes(name,
new String[] { SUPPORTED_CONTROL });
return mapper.mapFromAttributes(attributes);
return toStringArray(enumeration);
}
};
String[] controls = (String[]) tested.executeReadOnly(executor);
String[] controls = (String[]) tested.lookup("",
new String[] { SUPPORTED_CONTROL }, mapper);
System.out.println(Arrays.toString(controls));
assertEquals("Persistent Search LDAPv3 control,",
"2.16.840.1.113730.3.4.3", controls[0]);
@@ -88,4 +71,12 @@ public class SupportedControlsITest extends AbstractLdapTemplateIntegrationTest
public void setTested(LdapTemplate tested) {
this.tested = tested;
}
private String[] toStringArray(NamingEnumeration enumeration) {
LinkedList list = new LinkedList();
while (enumeration.hasMoreElements()) {
list.add((String) enumeration.nextElement());
}
return (String[]) list.toArray(new String[0]);
}
}