static means static stupid. Fix schema related bug introduced by the fix to issue #4 which resolve #5

Author: zapodot

src/main/java/org/zapodot/junit/ldap/EmbeddedLdapRuleBuilder.java

@@ -219,7 +219,7 @@ private Optional<Schema> customSchema() {
             if (!schemaFiles.isEmpty()) {
                 final Schema customSchema = initialSchema == null
                                             ? Schema.getSchema(schemaFiles)
-                                            : initialSchema.mergeSchemas(Schema.getSchema(schemaFiles));
+                                            : Schema.mergeSchemas(initialSchema, Schema.getSchema(schemaFiles));
                 return Optional.fromNullable(customSchema);
             } else {
                 return Optional.absent();

src/test/java/org/zapodot/junit/ldap/EmbeddedLdapRuleCustomStandardAndCustomSchemaTest.java

@@ -0,0 +1,25 @@
+package org.zapodot.junit.ldap;
+
+import com.unboundid.ldap.sdk.schema.AttributeTypeDefinition;
+import com.unboundid.ldap.sdk.schema.Schema;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+
+public class EmbeddedLdapRuleCustomStandardAndCustomSchemaTest {
+
+    @Rule
+    public EmbeddedLdapRule embeddedLdapRule = EmbeddedLdapRuleBuilder.newInstance()
+                                                                      .withSchema("custom-schema.ldif")
+                                                                      .build();
+
+    @Test
+    public void testFindCustomAttribute() throws Exception {
+        final Schema currentSchema = embeddedLdapRule.ldapConnection().getSchema();
+        final AttributeTypeDefinition changelogAttribute =
+                currentSchema.getAttributeType("attribute");
+        assertNotNull(changelogAttribute);
+        assertNotNull(currentSchema.getObjectClass("type"));
+    }
+}

…ap/EmbeddedLdapRuleCustomSchemaTest.java …RuleCustomWithoutStandardSchemaTest.javasrc/test/java/org/zapodot/junit/ldap/EmbeddedLdapRuleCustomSchemaTest.java renamed to src/test/java/org/zapodot/junit/ldap/EmbeddedLdapRuleCustomWithoutStandardSchemaTest.java src/test/java/org/zapodot/junit/ldap/EmbeddedLdapRuleCustomSchemaTest.java renamed to src/test/java/org/zapodot/junit/ldap/EmbeddedLdapRuleCustomWithoutStandardSchemaTest.java

@@ -6,7 +6,7 @@
 
 import static org.junit.Assert.assertNotNull;
 
-public class EmbeddedLdapRuleCustomSchemaTest {
+public class EmbeddedLdapRuleCustomWithoutStandardSchemaTest {
 
     @Rule
     public EmbeddedLdapRule embeddedLdapRule = EmbeddedLdapRuleBuilder.newInstance()

src/test/resources/custom-schema.ldif

@@ -0,0 +1,7 @@
+dn: cn=custom-schema
+objectClass: top
+objectClass: ldapSubEntry
+objectClass: subschema
+cn: custom-schema
+attributeTypes: ( 1.3.6.1.4.1.41609.1.75 NAME 'attribute' DESC 'A simple attribute' SUP name SINGLE-VALUE )
+objectClasses: ( 1.3.6.1.4.1.41609.2.13 NAME 'type' DESC 'A simple objectClass' SUP top STRUCTURAL MUST ( cn $ attribute ) MAY ( description ) )