svn commit: r569664 - in /directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core: jndi/CreateContextITest.java operational/BinaryAttributeFilterITest.java sp/LdapClassLoaderITest.java

[el...@apache.org]

Author: elecharny
Date: Sat Aug 25 06:42:02 2007
New Revision: 569664

URL: http://svn.apache.org/viewvc?rev=569664&view=rev
Log:
Fixed three tests where some entries contained no STRUCTURAL objectClasses, which is not allowed by the RFC

Modified:
    directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java
    directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java
    directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderITest.java

Modified: directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java?rev=569664&r1=569663&r2=569664&view=diff
==============================================================================
--- directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java (original)
+++ directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java Sat Aug 25 06:42:02 2007
@@ -253,7 +253,7 @@
         Attributes attrs = new AttributesImpl( true );
         Attribute objclass = new AttributeImpl( "objectClass" );
         objclass.add( "top" );
-        objclass.add( "extensibleObject" );
+        objclass.add( "organizationalUnit" );
         attrs.put( objclass );
 
         Name relativeName = new CompositeName( "ou=services" );

Modified: directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java?rev=569664&r1=569663&r2=569664&view=diff
==============================================================================
--- directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java (original)
+++ directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java Sat Aug 25 06:42:02 2007
@@ -26,6 +26,7 @@
 import javax.naming.directory.DirContext;
 
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -46,10 +47,16 @@
     public void testBinaryExtension() throws NamingException
     {
         Attributes attributes = new AttributesImpl( true );
-        attributes.put( "objectClass", "top" );
-        attributes.put( "objectClass", "organizationalUnit" );
-        attributes.put( "objectClass", "extensibleObject" );
-        attributes.put( "ou", "testing" );
+        Attribute oc = new AttributeImpl( "objectClass", "top" );
+        oc.add( "person" );
+        oc.add( "organizationalPerson" );
+        oc.add( "inetOrgPerson" );
+        attributes.put( oc );
+        
+        attributes.put( "ou", "test" );
+        attributes.put( "cn", "test" );
+        attributes.put( "sn", "test" );
+
         sysRoot.createSubcontext( "ou=test", attributes );
 
         // test without turning on the property

Modified: directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderITest.java?rev=569664&r1=569663&r2=569664&view=diff
==============================================================================
--- directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderITest.java (original)
+++ directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderITest.java Sat Aug 25 06:42:02 2007
@@ -94,6 +94,11 @@
         Attributes classLoaderDefaultSearchContextConfig = new AttributesImpl();
         Attribute objectClass = new AttributeImpl( "objectClass" );
         objectClass.add( "top" );
+        objectClass.add( "javaContainer" );
+        
+        // We need to ad this extensibleObject OC in order to avoid an error
+        // with the classLoaderDefaultSearchContext AT used later (no OC contains
+        // this AT)
         objectClass.add( "extensibleObject" );
 
         // create custom config entry