Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 78801 invoked from network); 10 Aug 2006 05:58:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Aug 2006 05:58:47 -0000 Received: (qmail 13369 invoked by uid 500); 10 Aug 2006 05:58:47 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 13338 invoked by uid 500); 10 Aug 2006 05:58:47 -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 13327 invoked by uid 99); 10 Aug 2006 05:58:47 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2006 22:58:47 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2006 22:58:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 41B0F1A981A; Wed, 9 Aug 2006 22:58:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r430269 - /directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Date: Thu, 10 Aug 2006 05:58:25 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060810055826.41B0F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Wed Aug 9 22:58:25 2006 New Revision: 430269 URL: http://svn.apache.org/viewvc?rev=430269&view=rev Log: Fix for DIRSERVER-702: Trying to remove an attribute which is part of the RDN does not cause an error. This was a bug caused by the move to using OIDs instead of the more faulty first alias. Modified: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Modified: directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=430269&r1=430268&r2=430269&view=diff ============================================================================== --- directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original) +++ directory/trunks/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Wed Aug 9 22:58:25 2006 @@ -534,12 +534,12 @@ LdapDN name = new LdapDN( "ou=user,dc=example,dc=com" ); // postive test which should pass - SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new BasicAttribute( "cn", "does not matter" ) ); + SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new BasicAttribute( "cn", "does not matter" ), registries.getOidRegistry() ); // test should fail since we are removing the ou attribute try { - SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new BasicAttribute( "ou" ) ); + SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new BasicAttribute( "ou" ), registries.getOidRegistry() ); fail( "should never get here due to a LdapSchemaViolationException being thrown" ); } catch ( LdapSchemaViolationException e ) @@ -549,12 +549,12 @@ // test success using more than one attribute for the Rdn but not modifying rdn attribute name = new LdapDN( "ou=users+cn=system users,dc=example,dc=com" ); - SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new BasicAttribute( "sn", "does not matter" ) ); + SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new BasicAttribute( "sn", "does not matter" ), registries.getOidRegistry() ); // test for failure when modifying Rdn attribute in multi attribute Rdn try { - SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new BasicAttribute( "cn" ) ); + SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new BasicAttribute( "cn" ), registries.getOidRegistry() ); fail( "should never get here due to a LdapSchemaViolationException being thrown" ); } catch ( LdapSchemaViolationException e ) @@ -567,14 +567,14 @@ Attribute attribute = new BasicAttribute( "ou" ); attribute.add( "container" ); attribute.add( "users" ); - SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attribute ); + SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attribute, registries.getOidRegistry() ); // now let's make it fail by not including the old value for ou (users) attribute = new BasicAttribute( "ou" ); attribute.add( "container" ); try { - SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attribute ); + SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attribute, registries.getOidRegistry() ); fail( "should never get here due to a LdapSchemaViolationException being thrown" ); } catch ( LdapSchemaViolationException e )