You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/08/25 15:43:57 UTC

svn commit: r569666 - in /directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service: DIRSERVER1013ITest.java ReplicationServiceITest.java

Author: elecharny
Date: Sat Aug 25 06:43:57 2007
New Revision: 569666

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

Modified:
    directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java
    directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java

Modified: directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java?rev=569666&r1=569665&r2=569666&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java (original)
+++ directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/DIRSERVER1013ITest.java Sat Aug 25 06:43:57 2007
@@ -52,7 +52,9 @@
         
         Attributes entry = new AttributesImpl( true );
         entry.put( "cn", "test" );
-        entry.put( "objectClass", "top" ).add( "extensibleObject" );
+        
+        // We add the 'room' OC to have at least a STRUCTURAL OC
+        entry.put( "objectClass", "top" ).add( "room" );
         ctxA.bind( "cn=test,ou=system", null, entry );
         
         Attributes attributes = ctxA.getAttributes( "cn=test,ou=system" );

Modified: directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java?rev=569666&r1=569665&r2=569666&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java (original)
+++ directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java Sat Aug 25 06:43:57 2007
@@ -75,8 +75,16 @@
 
         Attributes entryA = new AttributesImpl( true );
         entryA.put( "cn", "test" );
+        entryA.put( "sn", "test" );
         entryA.put( "ou", "A" );
-        entryA.put( "objectClass", "top" ).add( "extensibleObject" );
+        
+        Attribute oc = new AttributeImpl( "objectClass" );
+        oc.add( "top" );
+        oc.add( "person" );
+        oc.add( "organizationalPerson" );
+
+        entryA.put( oc );
+        
         ctxA.bind( "cn=test,ou=system", null, entryA );
         
         // Ensure the second bind is undebatebly the second.
@@ -84,8 +92,9 @@
 
         Attributes entryB = new AttributesImpl( true );
         entryB.put( "cn", "test" );
+        entryB.put( "sn", "test" );
         entryB.put( "ou", "B" );
-        entryB.put( "objectClass", "top" ).add( "extensibleObject" );
+        entryB.put( oc );
         ctxB.bind( "cn=test,ou=system", null, entryB );
 
         // Let both replicas replicate.  Note that a replica can only receive
@@ -111,7 +120,15 @@
         
         Attributes entry = new AttributesImpl( true );
         entry.put( "cn", "test" );
-        entry.put( "objectClass", "top" ).add( "extensibleObject" );
+        entry.put( "sn", "test" );
+        
+        Attribute oc = new AttributeImpl( "objectClass" );
+        oc.add( "top" );
+        oc.add( "person" );
+        oc.add( "organizationalPerson" );
+        
+        entry.put( oc );
+        
         ctxA.bind( dn, null, entry );
 
         replicationServices.get( "A" ).replicate();