Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 23346 invoked from network); 4 Dec 2009 11:01:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Dec 2009 11:01:13 -0000 Received: (qmail 35901 invoked by uid 500); 4 Dec 2009 11:01:12 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 35835 invoked by uid 500); 4 Dec 2009 11:01:12 -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 35825 invoked by uid 99); 4 Dec 2009 11:01:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Dec 2009 11:01:12 +0000 X-ASF-Spam-Status: No, hits=-4.1 required=5.0 tests=AWL,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; Fri, 04 Dec 2009 11:01:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BA82F23889DF; Fri, 4 Dec 2009 11:00:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r887155 - /directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerTest.java Date: Fri, 04 Dec 2009 11:00:46 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091204110046.BA82F23889DF@eris.apache.org> Author: elecharny Date: Fri Dec 4 11:00:46 2009 New Revision: 887155 URL: http://svn.apache.org/viewvc?rev=887155&view=rev Log: Modified the initialization to speedup the tests Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerTest.java Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerTest.java?rev=887155&r1=887154&r2=887155&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerTest.java (original) +++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerTest.java Fri Dec 4 11:00:46 2009 @@ -32,16 +32,13 @@ import javax.naming.directory.NoSuchAttributeException; import org.apache.commons.io.FileUtils; -import org.apache.directory.server.schema.loader.ldif.LdifSchemaLoaderTest; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.UsageEnum; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.shared.schema.DefaultSchemaManager; -import org.apache.directory.shared.schema.loader.ldif.JarLdifSchemaLoader; import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.schema.loader.ldif.SchemaEntityFactory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -58,12 +55,15 @@ // A directory in which the ldif files will be stored private static String workingDirectory; + // The schema repository + private static File schemaRepository; + + // A LDIF loader - private static LdifSchemaLoader ldifLoader; + //private static LdifSchemaLoader ldifLoader; // A SchemaObject factory - private static SchemaEntityFactory factory; - + //private static SchemaEntityFactory factory; @BeforeClass public static void setup() throws Exception @@ -72,19 +72,18 @@ if ( workingDirectory == null ) { - String path = LdifSchemaLoaderTest.class.getResource( "" ).getPath(); + String path = SchemaManagerTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } + schemaRepository = new File( workingDirectory, "schema" ); + // Cleanup the target directory - FileUtils.deleteDirectory( new File( workingDirectory + "/schema" ) ); + FileUtils.deleteDirectory( schemaRepository ); SchemaLdifExtractor extractor = new SchemaLdifExtractor( new File( workingDirectory ) ); extractor.extractOrCopy(); - - ldifLoader = new LdifSchemaLoader( new File( workingDirectory, "schema" ) ); - factory = new SchemaEntityFactory(); } @@ -92,13 +91,13 @@ public static void cleanup() throws IOException { // Cleanup the target directory - FileUtils.deleteDirectory( new File( workingDirectory + "/schema" ) ); + FileUtils.deleteDirectory( schemaRepository ); } private SchemaManager loadSystem() throws Exception { - JarLdifSchemaLoader loader = new JarLdifSchemaLoader(); + LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository ); SchemaManager schemaManager = new DefaultSchemaManager( loader ); String schemaName = "system";