Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 32705 invoked from network); 29 Dec 2009 14:45:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Dec 2009 14:45:57 -0000 Received: (qmail 73612 invoked by uid 500); 29 Dec 2009 14:45:57 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 73557 invoked by uid 500); 29 Dec 2009 14:45:57 -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 73548 invoked by uid 99); 29 Dec 2009 14:45:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Dec 2009 14:45:57 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 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, 29 Dec 2009 14:45:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BE2DA23889E9; Tue, 29 Dec 2009 14:45:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r894401 - in /directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core: schema/ suites/ Date: Tue, 29 Dec 2009 14:45:29 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091229144529.BE2DA23889E9@eris.apache.org> Author: kayyagari Date: Tue Dec 29 14:45:28 2009 New Revision: 894401 URL: http://svn.apache.org/viewvc?rev=894401&view=rev Log: o migrated SchemaISuite tests to use the new testing framework o fixed an issue with lowering the schema file path in AbstractMetaSchemaObjectHandlerIT.isOnDisk() method Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/suites/SchemaISuite.java Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java Tue Dec 29 14:45:28 2009 @@ -22,10 +22,11 @@ import java.io.File; import java.util.Enumeration; +import org.apache.directory.server.core.integ.AbstractTestUnit; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.util.StringTools; -import org.junit.BeforeClass; +import org.junit.Before; /** * A common class for all the MetaXXXHandler test classes @@ -33,16 +34,14 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -public abstract class AbstractMetaSchemaObjectHandlerIT +public abstract class AbstractMetaSchemaObjectHandlerIT extends AbstractTestUnit { protected static String workingDir; - @BeforeClass - public static final void init() + @Before + public final void init() { - String path = AbstractMetaSchemaObjectHandlerIT.class.getResource( "" ).getPath(); - int targetPos = path.indexOf( "target" ); - workingDir = path.substring( 0, targetPos + 6 ) + "/server-work/schema"; + workingDir = service.getWorkingDirectory().getAbsolutePath(); } @@ -55,7 +54,7 @@ { StringBuilder sb = new StringBuilder(); - sb.append( workingDir ).append( '/' ).append( "ou=schema" ); + sb.append( workingDir ).append( '/' ).append( service.getSchemaService().getSchemaPartition().getId() ).append( '/' ).append( "ou=schema" ); Enumeration rdns = dn.getAllRdn(); @@ -79,10 +78,12 @@ */ protected boolean isOnDisk( LdapDN dn ) { - String schemaObjectFileName = StringTools.toLowerCase( getSchemaPath( dn ) ); + // donot change the value of getSchemaPath to lowercase + // on Linux this gives a wrong path + String schemaObjectFileName = getSchemaPath( dn ); File file = new File( schemaObjectFileName ); - + return file.exists(); } Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Tue Dec 29 14:45:28 2009 @@ -36,17 +36,13 @@ import javax.naming.directory.ModificationItem; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.CiRunner; -import org.apache.directory.server.core.integ.Level; -import org.apache.directory.server.core.integ.annotations.CleanupLevel; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.exception.LdapInvalidNameException; import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.util.AttributeUtils; import org.junit.Ignore; import org.junit.Test; @@ -60,8 +56,7 @@ * @author Apache Directory Project * @version $Rev$ */ -@RunWith ( CiRunner.class ) -@CleanupLevel( Level.CLASS ) +@RunWith ( FrameworkRunner.class ) public class MetaAttributeTypeHandlerIT extends AbstractMetaSchemaObjectHandlerIT { private static final String DESCRIPTION0 = "A test attributeType"; @@ -71,9 +66,6 @@ private static final String NEW_OID = "1.3.6.1.4.1.18060.0.4.0.2.100001"; private static final String DEPENDEE_OID = "1.3.6.1.4.1.18060.0.4.0.2.100002"; - public static DirectoryService service; - public static SchemaManager schemaManager; - // ---------------------------------------------------------------------- // Test all core methods with normal operational pathways // ---------------------------------------------------------------------- Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Tue Dec 29 14:45:28 2009 @@ -39,9 +39,7 @@ import javax.naming.directory.ModificationItem; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.CiRunner; -import org.apache.directory.server.core.integ.Level; -import org.apache.directory.server.core.integ.annotations.CleanupLevel; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.exception.LdapInvalidNameException; import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException; @@ -65,14 +63,12 @@ * @author Apache Directory Project * @version $Rev$ */ -@RunWith(CiRunner.class) -@CleanupLevel(Level.CLASS) +@RunWith(FrameworkRunner.class) public class MetaComparatorHandlerIT extends AbstractMetaSchemaObjectHandlerIT { private static final String OID = "1.3.6.1.4.1.18060.0.4.0.1.100000"; private static final String NEW_OID = "1.3.6.1.4.1.18060.0.4.0.1.100001"; - public static DirectoryService service; public static SchemaManager schemaManager; class DummyMR extends MatchingRule Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Tue Dec 29 14:45:28 2009 @@ -37,6 +37,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.integ.CiRunner; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.Level; import org.apache.directory.server.core.integ.annotations.CleanupLevel; import org.apache.directory.shared.ldap.constants.SchemaConstants; @@ -60,8 +61,7 @@ * @author Apache Directory Project * @version $Rev$ */ -@RunWith ( CiRunner.class ) -@CleanupLevel( Level.CLASS ) +@RunWith(FrameworkRunner.class) public class MetaMatchingRuleHandlerIT extends AbstractMetaSchemaObjectHandlerIT { private static final String DESCRIPTION0 = "A test matchingRule"; @@ -71,7 +71,6 @@ private static final String NEW_OID = "1.3.6.1.4.1.18060.0.4.0.1.100001"; - public static DirectoryService service; public static SchemaManager schemaManager; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Tue Dec 29 14:45:28 2009 @@ -40,6 +40,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.integ.CiRunner; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.Level; import org.apache.directory.server.core.integ.annotations.CleanupLevel; import org.apache.directory.shared.ldap.constants.SchemaConstants; @@ -65,15 +66,12 @@ * @author Apache Directory Project * @version $Rev$ */ -@RunWith ( CiRunner.class ) -@CleanupLevel( Level.CLASS ) +@RunWith(FrameworkRunner.class) public class MetaNormalizerHandlerIT extends AbstractMetaSchemaObjectHandlerIT { private static final String OID = "1.3.6.1.4.1.18060.0.4.0.1.100000"; private static final String NEW_OID = "1.3.6.1.4.1.18060.0.4.0.1.100001"; - - public static DirectoryService service; public static SchemaManager schemaManager; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Tue Dec 29 14:45:28 2009 @@ -37,6 +37,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.integ.CiRunner; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.Level; import org.apache.directory.server.core.integ.annotations.CleanupLevel; import org.apache.directory.shared.ldap.exception.LdapInvalidNameException; @@ -58,8 +59,7 @@ * @author Apache Directory Project * @version $Rev$ */ -@RunWith ( CiRunner.class ) -@CleanupLevel( Level.CLASS ) +@RunWith(FrameworkRunner.class) public class MetaObjectClassHandlerIT extends AbstractMetaSchemaObjectHandlerIT { private static final String NAME = "testObjectClass"; @@ -74,9 +74,6 @@ private static final String DEPENDEE_OID = "1.3.6.1.4.1.18060.0.4.0.3.100002"; - public static DirectoryService service; - - private static ObjectClassRegistry getObjectClassRegistry() { return service.getSchemaManager().getObjectClassRegistry(); Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Tue Dec 29 14:45:28 2009 @@ -37,6 +37,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.integ.CiRunner; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.IntegrationUtils; import org.apache.directory.server.core.integ.Level; import org.apache.directory.server.core.integ.annotations.CleanupLevel; @@ -98,8 +99,7 @@ * @author Apache Directory Project * @version $Rev$ */ -@RunWith ( CiRunner.class ) -@CleanupLevel( Level.CLASS ) +@RunWith(FrameworkRunner.class) public class MetaSchemaHandlerIT extends AbstractMetaSchemaObjectHandlerIT { /** a test attribute in the test schema: uidNumber in nis schema */ @@ -108,8 +108,6 @@ /** Another test attribute : krb5principalName taken from the Krb5Kdc schema */ private static final String KRB5_PRINCIPAL_NAME_ATTR = "krb5PrincipalName"; - public static DirectoryService service; - @Before public void checkSambaSchema() throws Exception Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Tue Dec 29 14:45:28 2009 @@ -40,6 +40,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.integ.CiRunner; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.Level; import org.apache.directory.server.core.integ.annotations.CleanupLevel; import org.apache.directory.shared.ldap.exception.LdapInvalidNameException; @@ -64,15 +65,12 @@ * @author Apache Directory Project * @version $Rev$ */ -@RunWith ( CiRunner.class ) -@CleanupLevel( Level.CLASS ) +@RunWith(FrameworkRunner.class) public class MetaSyntaxCheckerHandlerIT extends AbstractMetaSchemaObjectHandlerIT { 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 DirectoryService service; public static SchemaManager schemaManager; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Tue Dec 29 14:45:28 2009 @@ -44,6 +44,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.integ.CiRunner; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.Level; import org.apache.directory.server.core.integ.annotations.CleanupLevel; import org.apache.directory.shared.ldap.exception.LdapInvalidNameException; @@ -67,8 +68,7 @@ * @author Apache Directory Project * @version $Rev$ */ -@RunWith ( CiRunner.class ) -@CleanupLevel( Level.CLASS ) +@RunWith(FrameworkRunner.class) public class MetaSyntaxHandlerIT extends AbstractMetaSchemaObjectHandlerIT { private static final String DESCRIPTION0 = "A test normalizer"; @@ -82,8 +82,6 @@ private static final String SUBSCHEMA_SUBENTRY = "subschemaSubentry"; - - public static DirectoryService service; public static SchemaManager schemaManager; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java Tue Dec 29 14:45:28 2009 @@ -37,26 +37,20 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.CiRunner; -import org.apache.directory.server.core.integ.Level; -import org.apache.directory.server.core.integ.annotations.CleanupLevel; +import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.MetaSchemaConstants; import org.apache.directory.shared.ldap.name.LdapDN; import org.junit.Test; import org.junit.runner.RunWith; -@RunWith ( CiRunner.class ) -@CleanupLevel( Level.CLASS ) -public class ObjectClassCreateIT +@RunWith(FrameworkRunner.class) +public class ObjectClassCreateIT extends AbstractTestUnit { private String testOID = "1.3.6.1.4.1.18060.0.4.0.3.1.555555.5555.5555555"; - public static DirectoryService service; - - private void injectSchema() throws Exception { //-------------------------------------------------------------------- Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Tue Dec 29 14:45:28 2009 @@ -43,8 +43,9 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.CiRunner; +import org.apache.directory.server.core.annotations.DSBuilder; +import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser; @@ -59,14 +60,13 @@ * @author Apache Directory Project * @version $Rev$ */ -@RunWith(CiRunner.class) -public class SchemaPersistenceIT +@RunWith(FrameworkRunner.class) +@DSBuilder( name="SchemaPersistenceIT-class" ) +public class SchemaPersistenceIT extends AbstractTestUnit { private static final String SUBSCHEMA_SUBENTRY = "subschemaSubentry"; private static final AttributeTypeDescriptionSchemaParser ATTRIBUTE_TYPE_DESCRIPTION_SCHEMA_PARSER = new AttributeTypeDescriptionSchemaParser(); - public static DirectoryService service; - /** * Tests to see if an attributeType is persisted when added, then server Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java Tue Dec 29 14:45:28 2009 @@ -42,14 +42,16 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.annotations.ApplyLdifs; +import org.apache.directory.server.core.annotations.DSBuilder; import org.apache.directory.server.core.entry.DefaultServerEntry; -import org.apache.directory.server.core.integ.CiRunner; -import org.apache.directory.server.core.integ.annotations.ApplyLdifs; +import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.ldif.LdifReader; import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.name.LdapDN; import org.junit.Test; import org.junit.runner.RunWith; @@ -80,12 +82,9 @@ "cn: person2\n" + "sn: sn_person2\n" } ) -@RunWith ( CiRunner.class ) -public class SchemaServiceIT +@RunWith(FrameworkRunner.class) +public class SchemaServiceIT extends AbstractTestUnit { - /** The Directory service */ - public static DirectoryService service; - /** * For DIRSERVER-925. Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/suites/SchemaISuite.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/suites/SchemaISuite.java?rev=894401&r1=894400&r2=894401&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/suites/SchemaISuite.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/suites/SchemaISuite.java Tue Dec 29 14:45:28 2009 @@ -19,7 +19,8 @@ package org.apache.directory.server.core.suites; -import org.apache.directory.server.core.integ.CiSuite; +import org.apache.directory.server.core.annotations.DSBuilder; +import org.apache.directory.server.core.integ.FrameworkSuite; import org.apache.directory.server.core.integ.Level; import org.apache.directory.server.core.integ.annotations.CleanupLevel; import org.apache.directory.server.core.schema.MetaAttributeTypeHandlerIT; @@ -43,7 +44,8 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith ( CiSuite.class ) +@RunWith ( FrameworkSuite.class ) +@DSBuilder( name="SchemaISuite" ) @Suite.SuiteClasses ( { MetaAttributeTypeHandlerIT.class, MetaComparatorHandlerIT.class, @@ -58,7 +60,6 @@ //SubschemaSubentryIT.class, SchemaServiceIT.class } ) -@CleanupLevel ( Level.SUITE ) public class SchemaISuite { }