Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 798617180 for ; Tue, 15 Nov 2011 22:37:41 +0000 (UTC) Received: (qmail 59977 invoked by uid 500); 15 Nov 2011 22:37:41 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 59934 invoked by uid 500); 15 Nov 2011 22:37:41 -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 59927 invoked by uid 99); 15 Nov 2011 22:37:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Nov 2011 22:37:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Nov 2011 22:37:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4547123889EC for ; Tue, 15 Nov 2011 22:37:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1202451 [2/2] - in /directory/apacheds/trunk/core-integ/src: main/java/org/apache/directory/server/core/integ/ test/java/org/apache/directory/server/core/schema/ Date: Tue, 15 Nov 2011 22:37:12 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111115223713.4547123889EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=1202451&r1=1202450&r2=1202451&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Tue Nov 15 22:37:11 2011 @@ -20,7 +20,6 @@ package org.apache.directory.server.core.schema; -import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -29,26 +28,22 @@ import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; import java.io.InputStream; -import javax.naming.InvalidNameException; -import javax.naming.NameNotFoundException; -import javax.naming.OperationNotSupportedException; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; - +import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.FrameworkRunner; +import org.apache.directory.server.core.integ.IntegrationUtils; +import org.apache.directory.shared.ldap.model.entry.DefaultEntry; +import org.apache.directory.shared.ldap.model.entry.DefaultModification; +import org.apache.directory.shared.ldap.model.entry.Entry; +import org.apache.directory.shared.ldap.model.entry.Modification; +import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.ldif.LdifUtils; import org.apache.directory.shared.ldap.model.name.Dn; +import org.apache.directory.shared.ldap.model.name.Rdn; import org.apache.directory.shared.ldap.model.schema.LdapSyntax; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.model.schema.SyntaxChecker; import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker; -import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -68,12 +63,14 @@ public class MetaSyntaxCheckerHandlerIT private static final String OID = "1.3.6.1.4.1.18060.0.4.0.0.100000"; private static final String NEW_OID = "1.3.6.1.4.1.18060.0.4.0.0.100001"; - public static SchemaManager schemaManager; - + private static LdapConnection connection; + private static SchemaManager schemaManager; @Before - public void setup() + public void setup() throws Exception { + super.init(); + connection = IntegrationUtils.getAdminConnection( getService() ); schemaManager = getService().getSchemaManager(); } @@ -84,64 +81,77 @@ public class MetaSyntaxCheckerHandlerIT @Test public void testAddSyntaxCheckerToEnabledSchema() throws Exception { - Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop", - "objectClass: metaSyntaxChecker", "m-fqcn", OctetStringSyntaxChecker.class.getName(), "m-oid", OID, + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); + + Entry entry = new DefaultEntry( + dn, + "objectClass: top", + "objectClass: metaTop", + "objectClass: metaSyntaxChecker", + "m-fqcn", OctetStringSyntaxChecker.class.getName(), + "m-oid", OID, "m-description: A test syntaxChecker" ); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); - getSchemaContext( getService() ).createSubcontext( JndiUtils.toName( dn ), attrs ); + connection.add( entry ); assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ); assertEquals( schemaManager.getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" ); Class clazz = schemaManager.getSyntaxCheckerRegistry().lookup( OID ).getClass(); assertEquals( clazz, OctetStringSyntaxChecker.class ); - assertTrue( isOnDisk0( dn ) ); + assertTrue( isOnDisk( dn ) ); } @Test public void testAddSyntaxCheckerToDisabledSchema() throws Exception { - Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop", - "objectClass: metaSyntaxChecker", "m-fqcn", OctetStringSyntaxChecker.class.getName(), "m-oid", OID, + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=nis,ou=schema" ); + + Entry entry = new DefaultEntry( + dn, + "objectClass: top", + "objectClass: metaTop", + "objectClass: metaSyntaxChecker", + "m-fqcn", OctetStringSyntaxChecker.class.getName(), + "m-oid", OID, "m-description: A test syntaxChecker" ); // nis is by default inactive - Dn dn = getSyntaxCheckerContainer( "nis" ); - dn = dn.add( "m-oid" + "=" + OID ); - getSchemaContext( getService() ).createSubcontext( JndiUtils.toName( dn ), attrs ); + connection.add( entry ); assertFalse( "adding new syntaxChecker to disabled schema should not register it into the registries", schemaManager.getSyntaxCheckerRegistry().contains( OID ) ); - assertTrue( isOnDisk0( dn ) ); + assertTrue( isOnDisk( dn ) ); } @Test public void testAddSyntaxCheckerToUnloadedSchema() throws Exception { - Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop", - "objectClass: metaSyntaxChecker", "m-fqcn", OctetStringSyntaxChecker.class.getName(), "m-oid", OID, + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=notloaded,ou=schema" ); + Entry entry = new DefaultEntry( + dn, + "objectClass: top", + "objectClass: metaTop", + "objectClass: metaSyntaxChecker", + "m-fqcn", OctetStringSyntaxChecker.class.getName(), + "m-oid", OID, "m-description: A test syntaxChecker" ); // nis is by default inactive - Dn dn = getSyntaxCheckerContainer( "notloaded" ); - dn = dn.add( "m-oid" + "=" + OID ); - try { - getSchemaContext( getService() ).createSubcontext( JndiUtils.toName( dn ), attrs ); + connection.add( entry ); fail( "Should not be there" ); } - catch ( NameNotFoundException nnfe ) + catch ( LdapException le ) { // Expected result. } assertFalse( "adding new syntaxChecker to disabled schema should not register it into the registries", schemaManager.getSyntaxCheckerRegistry().contains( OID ) ); - assertFalse( isOnDisk0( dn ) ); + assertFalse( isOnDisk( dn ) ); } @@ -156,20 +166,25 @@ public class MetaSyntaxCheckerHandlerIT out.write( in.read() ); } - Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop", - "objectClass: metaSyntaxChecker", "m-fqcn", - "org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker", "m-bytecode", out - .toByteArray(), "m-oid", OID, "m-description: A test syntaxChecker" ); - - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); - getSchemaContext( getService() ).createSubcontext( JndiUtils.toName( dn ), attrs ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); + + Entry entry = new DefaultEntry( + dn, + "objectClass: top", + "objectClass: metaTop", + "objectClass: metaSyntaxChecker", + "m-fqcn", "org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker", + "m-bytecode", out.toByteArray(), + "m-oid", OID, + "m-description: A test syntaxChecker" ); + + connection.add( entry ); assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ); assertEquals( schemaManager.getSyntaxCheckerRegistry().getSchemaName( OID ), "apachemeta" ); Class clazz = schemaManager.getSyntaxCheckerRegistry().lookup( OID ).getClass(); assertEquals( clazz.getName(), "org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker" ); - assertTrue( isOnDisk0( dn ) ); + assertTrue( isOnDisk( dn ) ); } @@ -184,32 +199,37 @@ public class MetaSyntaxCheckerHandlerIT out.write( in.read() ); } - Attributes attrs = LdifUtils.createJndiAttributes("objectClass: top", "objectClass: metaTop", - "objectClass: metaSyntaxChecker", "m-fqcn", - "org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker", "m-bytecode", out - .toByteArray(), "m-oid", OID, "m-description: A test syntaxChecker"); - - Dn dn = getSyntaxCheckerContainer( "nis" ); - dn = dn.add( "m-oid" + "=" + OID ); - getSchemaContext( getService() ).createSubcontext( JndiUtils.toName( dn ), attrs ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=nis,ou=schema" ); + + Entry entry = new DefaultEntry( + dn, + "objectClass: top", + "objectClass: metaTop", + "objectClass: metaSyntaxChecker", + "m-fqcn", "org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker", + "m-bytecode", out.toByteArray(), + "m-oid", OID, + "m-description: A test syntaxChecker"); + + connection.add( entry ); assertFalse( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ); - assertTrue( isOnDisk0( dn ) ); + assertTrue( isOnDisk( dn ) ); } @Test public void testDeleteSyntaxCheckerFromEnabledSchema() throws Exception { - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); + testAddSyntaxCheckerToEnabledSchema(); assertTrue( "syntaxChecker should be removed from the registry after being deleted", schemaManager .getSyntaxCheckerRegistry().contains( OID ) ); - assertTrue( isOnDisk0( dn ) ); + assertTrue( isOnDisk( dn ) ); - getSchemaContext( getService() ).destroySubcontext( JndiUtils.toName( dn ) ); + connection.delete( dn ); assertFalse( "syntaxChecker should be removed from the registry after being deleted", schemaManager .getSyntaxCheckerRegistry().contains( OID ) ); @@ -223,22 +243,22 @@ public class MetaSyntaxCheckerHandlerIT { } - assertFalse( isOnDisk0( dn ) ); + assertFalse( isOnDisk( dn ) ); } @Test public void testDeleteSyntaxCheckerFromDisabledSchema() throws Exception { - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); + testAddSyntaxCheckerToEnabledSchema(); assertTrue( "syntaxChecker should be removed from the registry after being deleted", schemaManager .getSyntaxCheckerRegistry().contains( OID ) ); - assertTrue( isOnDisk0( dn ) ); + assertTrue( isOnDisk( dn ) ); - getSchemaContext( getService() ).destroySubcontext( JndiUtils.toName( dn ) ); + connection.delete( dn ); assertFalse( "syntaxChecker should be removed from the registry after being deleted", schemaManager .getSyntaxCheckerRegistry().contains( OID ) ); @@ -252,7 +272,7 @@ public class MetaSyntaxCheckerHandlerIT { } - assertFalse( isOnDisk0( dn ) ); + assertFalse( isOnDisk( dn ) ); } @@ -260,13 +280,12 @@ public class MetaSyntaxCheckerHandlerIT @Ignore public void testRenameSyntaxChecker() throws Exception { - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); + testAddSyntaxCheckerToEnabledSchema(); - Dn newdn = getSyntaxCheckerContainer( "apachemeta" ); - newdn = newdn.add( "m-oid" + "=" + NEW_OID ); - getSchemaContext( getService() ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) ); + Rdn rdn = new Rdn( "m-oid=" + NEW_OID ); + connection.rename( dn, rdn ); assertFalse( "old syntaxChecker OID should be removed from the registry after being renamed", schemaManager .getSyntaxCheckerRegistry().contains( OID ) ); @@ -293,13 +312,11 @@ public class MetaSyntaxCheckerHandlerIT { testAddSyntaxCheckerToEnabledSchema(); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); - Dn newdn = getSyntaxCheckerContainer( "apache" ); - newdn = newdn.add( "m-oid" + "=" + OID ); + Dn newDn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apache,ou=schema" ); - getSchemaContext( getService() ).rename( JndiUtils.toName(dn), JndiUtils.toName( newdn ) ); + connection.move( dn, newDn ); assertTrue( "syntaxChecker OID should still be present", schemaManager.getSyntaxCheckerRegistry() .contains( OID ) ); @@ -318,13 +335,11 @@ public class MetaSyntaxCheckerHandlerIT { testAddSyntaxCheckerToEnabledSchema(); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); - Dn newdn = getSyntaxCheckerContainer( "apache" ); - newdn = newdn.add( "m-oid" + "=" + NEW_OID ); + Dn newDn = new Dn( "m-oid=" + NEW_OID + ",ou=syntaxCheckers,cn=apache,ou=schema" ); - getSchemaContext( getService() ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) ); + connection.moveAndRename( dn, newDn ); assertFalse( "old syntaxChecker OID should NOT be present", schemaManager.getSyntaxCheckerRegistry().contains( OID ) ); @@ -346,13 +361,11 @@ public class MetaSyntaxCheckerHandlerIT { testAddSyntaxCheckerToEnabledSchema(); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); - ModificationItem[] mods = new ModificationItem[1]; - Attribute attr = new BasicAttribute( "m-fqcn", BogusSyntaxChecker.class.getName() ); - mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr ); - getSchemaContext( getService() ).modifyAttributes( JndiUtils.toName( dn ), mods ); + Modification mod = new DefaultModification( + ModificationOperation.REPLACE_ATTRIBUTE, "m-fqcn", BogusSyntaxChecker.class.getName() ); + connection.modify( dn, mod ); assertTrue( "syntaxChecker OID should still be present", schemaManager.getSyntaxCheckerRegistry() .contains( OID ) ); @@ -371,12 +384,11 @@ public class MetaSyntaxCheckerHandlerIT { testAddSyntaxCheckerToEnabledSchema(); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); - Attributes mods = new BasicAttributes( true ); - mods.put( "m-fqcn", BogusSyntaxChecker.class.getName() ); - getSchemaContext( getService() ).modifyAttributes( JndiUtils.toName( dn ), DirContext.REPLACE_ATTRIBUTE, mods ); + Modification mod = new DefaultModification( + ModificationOperation.REPLACE_ATTRIBUTE, "m-fqcn", BogusSyntaxChecker.class.getName() ); + connection.modify( dn, mod ); assertTrue( "syntaxChecker OID should still be present", schemaManager.getSyntaxCheckerRegistry() .contains( OID ) ); @@ -395,38 +407,41 @@ public class MetaSyntaxCheckerHandlerIT @Test public void testDeleteSyntaxCheckerWhenInUse() throws Exception { - Dn scDn = getSyntaxCheckerContainer( "apachemeta" ); - scDn = scDn.add( "m-oid" + "=" + OID ); + Dn scDn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); // Create a new SyntaxChecker testAddSyntaxCheckerToEnabledSchema(); - assertTrue( isOnDisk0( scDn ) ); - assertTrue( getService().getSchemaManager().getSyntaxCheckerRegistry().contains( OID ) ); + assertTrue( isOnDisk( scDn ) ); + assertTrue( schemaManager.getSyntaxCheckerRegistry().contains( OID ) ); // Create a Syntax using this comparator - Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop", - "objectClass: metaSyntax", "m-oid", OID, "m-description: test" ); + Dn sDn = new Dn( "m-oid=" + OID + ",ou=syntaxes,cn=apachemeta,ou=schema" ); - Dn sDn = getSyntaxContainer( "apachemeta" ); - sDn = sDn.add( "m-oid" + "=" + OID ); + Entry entry = new DefaultEntry( + sDn, + "objectClass: top", + "objectClass: metaTop", + "objectClass: metaSyntax", + "m-oid", OID, + "m-description: test" ); // Pre-checks - assertFalse( isOnDisk0( sDn ) ); - assertFalse( getService().getSchemaManager().getLdapSyntaxRegistry().contains( OID ) ); + assertFalse( isOnDisk( sDn ) ); + assertFalse( schemaManager.getLdapSyntaxRegistry().contains( OID ) ); // Syntax Addition - getSchemaContext( getService() ).createSubcontext( JndiUtils.toName( sDn ), attrs ); + connection.add( entry ); // Post-checks - assertTrue( isOnDisk0( sDn ) ); - assertTrue( getService().getSchemaManager().getLdapSyntaxRegistry().contains( OID ) ); + assertTrue( isOnDisk( sDn ) ); + assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) ); try { - getSchemaContext( getService() ).destroySubcontext( JndiUtils.toName( scDn ) ); + connection.delete( scDn ); fail( "should not be able to delete a syntaxChecker in use" ); } - catch ( OperationNotSupportedException e ) + catch ( LdapException e ) { } @@ -442,18 +457,15 @@ public class MetaSyntaxCheckerHandlerIT testAddSyntaxCheckerToEnabledSchema(); schemaManager.getLdapSyntaxRegistry().register( new DummySyntax() ); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); - - Dn newdn = getSyntaxCheckerContainer( "apache" ); - newdn = newdn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); + Dn newDn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apache,ou=schema" ); try { - getSchemaContext( getService() ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) ); + connection.move( dn, newDn ); fail( "should not be able to move a syntaxChecker in use" ); } - catch ( OperationNotSupportedException e ) + catch ( LdapException e ) { } @@ -471,18 +483,15 @@ public class MetaSyntaxCheckerHandlerIT testAddSyntaxCheckerToEnabledSchema(); schemaManager.getLdapSyntaxRegistry().register( new DummySyntax() ); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); - - Dn newdn = getSyntaxCheckerContainer( "apache" ); - newdn = newdn.add( "m-oid" + "=" + NEW_OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); + Dn newDn = new Dn( "m-oid=" + NEW_OID + ",ou=syntaxCheckers,cn=apache,ou=schema" ); try { - getSchemaContext( getService() ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) ); + connection.move( dn, newDn ); fail( "should not be able to move a syntaxChecker in use" ); } - catch ( OperationNotSupportedException e ) + catch ( LdapException e ) { } @@ -497,20 +506,19 @@ public class MetaSyntaxCheckerHandlerIT @Ignore public void testRenameSyntaxCheckerWhenInUse() throws Exception { - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); + testAddSyntaxCheckerToEnabledSchema(); schemaManager.getLdapSyntaxRegistry().register( new DummySyntax() ); - Dn newdn = getSyntaxCheckerContainer( "apachemeta" ); - newdn = newdn.add( "m-oid" + "=" + NEW_OID ); + Rdn rdn = new Rdn( "m-oid=" + NEW_OID ); try { - getSchemaContext( getService() ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) ); + connection.rename( dn, rdn ); fail( "should not be able to rename a syntaxChecker in use" ); } - catch ( OperationNotSupportedException e ) + catch ( LdapException e ) { } @@ -531,18 +539,16 @@ public class MetaSyntaxCheckerHandlerIT { testAddSyntaxCheckerToEnabledSchema(); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); - Dn top = new Dn(); - top.add( "m-oid" + "=" + OID ); + Dn top = new Dn( "m-oid=" + OID ); try { - getSchemaContext( getService() ).rename( JndiUtils.toName( dn ), JndiUtils.toName( top ) ); + connection.move( dn, top ); fail( "should not be able to move a syntaxChecker up to ou=schema" ); } - catch ( InvalidNameException e ) + catch ( LdapException e ) { } @@ -557,18 +563,16 @@ public class MetaSyntaxCheckerHandlerIT { testAddSyntaxCheckerToEnabledSchema(); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); - Dn newdn = new Dn( "ou=comparators,cn=apachemeta" ); - newdn = newdn.add( "m-oid" + "=" + OID ); + Dn newDn = new Dn( "m-oid=" + OID + ",ou=comparators,cn=apachemeta,ou=schema" ); try { - getSchemaContext( getService() ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) ); + connection.move( dn, newDn ); fail( "should not be able to move a syntaxChecker into comparators container" ); } - catch ( InvalidNameException e ) + catch ( LdapException e ) { } @@ -583,14 +587,12 @@ public class MetaSyntaxCheckerHandlerIT { testAddSyntaxCheckerToEnabledSchema(); - Dn dn = getSyntaxCheckerContainer( "apachemeta" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); // nis is inactive by default - Dn newdn = getSyntaxCheckerContainer( "nis" ); - newdn = newdn.add( "m-oid" + "=" + OID ); + Dn newDn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=nis,ou=schema" ); - getSchemaContext( getService() ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) ); + connection.move( dn, newDn ); assertFalse( "syntaxChecker OID should no longer be present", schemaManager.getSyntaxCheckerRegistry() .contains( OID ) ); @@ -604,16 +606,14 @@ public class MetaSyntaxCheckerHandlerIT testAddSyntaxCheckerToDisabledSchema(); // nis is inactive by default - Dn dn = getSyntaxCheckerContainer( "nis" ); - dn = dn.add( "m-oid" + "=" + OID ); + Dn dn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=nis,ou=schema" ); assertFalse( "syntaxChecker OID should NOT be present when added to disabled nis schema", schemaManager .getSyntaxCheckerRegistry().contains( OID ) ); - Dn newdn = getSyntaxCheckerContainer( "apachemeta" ); - newdn = newdn.add( "m-oid" + "=" + OID ); + Dn newDn = new Dn( "m-oid=" + OID + ",ou=syntaxCheckers,cn=apachemeta,ou=schema" ); - getSchemaContext( getService() ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) ); + connection.move( dn, newDn ); assertTrue( "syntaxChecker OID should be present when moved to enabled schema", schemaManager .getSyntaxCheckerRegistry().contains( OID ) );