Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 75524 invoked from network); 25 Aug 2007 13:44:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Aug 2007 13:44:27 -0000 Received: (qmail 17814 invoked by uid 500); 25 Aug 2007 13:44:23 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 17777 invoked by uid 500); 25 Aug 2007 13:44:23 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 17766 invoked by uid 99); 25 Aug 2007 13:44:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Aug 2007 06:44:23 -0700 X-ASF-Spam-Status: No, hits=-98.8 required=10.0 tests=ALL_TRUSTED,FS_REPLICA X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Aug 2007 13:44:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 47A201A9838; Sat, 25 Aug 2007 06:43:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r569666 - in /directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service: DIRSERVER1013ITest.java ReplicationServiceITest.java Date: Sat, 25 Aug 2007 13:43:57 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070825134358.47A201A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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();