Skip to content

Commit 776f64a

Browse files
committed
fixes #43 - allows LdapServerExternalResource to use a Schema
1 parent 490de5a commit 776f64a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

lightblue-ldap-test/src/main/java/com/redhat/lightblue/ldap/test/LdapServerExternalResource.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.unboundid.ldap.listener.InMemoryListenerConfig;
3737
import com.unboundid.ldap.sdk.Attribute;
3838
import com.unboundid.ldap.sdk.LDAPException;
39+
import com.unboundid.ldap.sdk.schema.Schema;
3940
import com.unboundid.ldif.LDIFException;
4041

4142
public class LdapServerExternalResource extends ExternalResource {
@@ -52,7 +53,7 @@ public class LdapServerExternalResource extends ExternalResource {
5253
*/
5354
@SuppressWarnings("serial")
5455
public static LdapServerExternalResource createDefaultInstance(){
55-
return new LdapServerExternalResource(new LinkedHashMap<String, Attribute[]>(){{
56+
return new LdapServerExternalResource(null, new LinkedHashMap<String, Attribute[]>(){{
5657
put("dc=com", new Attribute[]{
5758
new Attribute("objectClass", "top"),
5859
new Attribute("objectClass", "domain"),
@@ -86,12 +87,14 @@ public static LdapServerExternalResource createDefaultInstance(){
8687
private InMemoryDirectoryServer server = null;
8788
private InMemoryLdapServer imlsAnnotation = null;
8889
private final LinkedHashMap<String, Attribute[]> preloadDnData;
90+
private final Schema schema;
8991

9092
public LdapServerExternalResource(){
91-
this.preloadDnData = null;
93+
this(null, null);
9294
}
9395

94-
public LdapServerExternalResource(LinkedHashMap<String, Attribute[]> preload){
96+
public LdapServerExternalResource(Schema schema, LinkedHashMap<String, Attribute[]> preload){
97+
this.schema = schema;
9598
this.preloadDnData = preload;
9699
}
97100

@@ -120,7 +123,7 @@ protected void before() throws Throwable {
120123
InMemoryListenerConfig listenerConfig = new InMemoryListenerConfig(
121124
imlsAnnotation.name(), null, imlsAnnotation.port(), null, null, null);
122125
config.setListenerConfigs(listenerConfig);
123-
config.setSchema(null); // do not check (attribute) schema
126+
config.setSchema(schema); // do not check (attribute) schema
124127

125128
server = new InMemoryDirectoryServer(config);
126129
server.startListening();

0 commit comments

Comments
 (0)