svn commit: r430267 - /directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java

[ak...@apache.org]

Author: akarasulu
Date: Wed Aug  9 22:57:25 2006
New Revision: 430267

URL: http://svn.apache.org/viewvc?rev=430267&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/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java

Modified: directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=430267&r1=430266&r2=430267&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/branches/apacheds/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Wed Aug  9 22:57: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 )