Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 67712 invoked from network); 23 Jun 2010 15:31:05 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Jun 2010 15:31:05 -0000 Received: (qmail 77183 invoked by uid 500); 23 Jun 2010 15:31:05 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 77140 invoked by uid 500); 23 Jun 2010 15:31:05 -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 77133 invoked by uid 99); 23 Jun 2010 15:31:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jun 2010 15:31:05 +0000 X-ASF-Spam-Status: No, hits=-1580.6 required=10.0 tests=ALL_TRUSTED,AWL 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; Wed, 23 Jun 2010 15:31:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB21523889B2; Wed, 23 Jun 2010 15:30:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r957250 - /directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java Date: Wed, 23 Jun 2010 15:30:12 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100623153012.EB21523889B2@eris.apache.org> Author: elecharny Date: Wed Jun 23 15:30:12 2010 New Revision: 957250 URL: http://svn.apache.org/viewvc?rev=957250&view=rev Log: reapplied http://svn.apache.org/viewvc?rev=956039&view=rev Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java?rev=957250&r1=957249&r2=957250&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java Wed Jun 23 15:30:12 2010 @@ -23,23 +23,19 @@ package org.apache.directory.server.core import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.File; -import java.util.Map; -import java.util.Set; -import org.apache.commons.lang.NotImplementedException; import org.apache.directory.server.core.DefaultDirectoryService; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.Schema; +import org.apache.directory.shared.ldap.schema.registries.SchemaLoader; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Ignore; @@ -53,12 +49,11 @@ import org.junit.Test; * * @author Apache Directory Project */ -@Ignore ( "Ignore this test until we get the LDIF partition in place." ) +//@Ignore ( "Ignore this test until we get the LDIF partition in place." ) public class PartitionSchemaLoaderTest { private static SchemaManager schemaManager; private static DirectoryService directoryService; - private static JdbmPartition schemaPartition; @BeforeClass public static void setUp() throws Exception @@ -97,153 +92,126 @@ public class PartitionSchemaLoaderTest { fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } - - // -------------------------------------------------------------------- - // TODO add code here to start up the LDIF schema partition - // -------------------------------------------------------------------- - - throw new NotImplementedException(); + + directoryService.setSchemaManager( schemaManager ); } - @Test public void testGetSchemas() throws Exception + @Test + public void testGetSchemas() throws Exception { - PartitionSchemaLoader loader = new PartitionSchemaLoader( schemaPartition, schemaManager ); - Map schemas = loader.getSchemas(); + SchemaLoader loader = directoryService.getSchemaManager().getLoader(); - Schema schema = schemas.get( "mozilla" ); + Schema schema = loader.getSchema( "mozilla" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "mozilla" ); //assertTrue( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "core" ); + schema = loader.getSchema( "core" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "core" ); assertFalse( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "apachedns" ); + schema = loader.getSchema( "apachedns" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "apachedns" ); //assertTrue( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "autofs" ); + schema = loader.getSchema( "autofs" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "autofs" ); //assertTrue( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "apache" ); + schema = loader.getSchema( "apache" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "apache" ); assertFalse( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "cosine" ); + schema = loader.getSchema( "cosine" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "cosine" ); assertFalse( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "krb5kdc" ); + schema = loader.getSchema( "krb5kdc" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "krb5kdc" ); //assertTrue( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "samba" ); + schema = loader.getSchema( "samba" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "samba" ); //assertTrue( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "collective" ); + schema = loader.getSchema( "collective" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "collective" ); assertFalse( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "java" ); + schema = loader.getSchema( "java" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "java" ); assertFalse( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "dhcp" ); + schema = loader.getSchema( "dhcp" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "dhcp" ); //assertTrue( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "corba" ); + schema = loader.getSchema( "corba" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "corba" ); //assertTrue( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "nis" ); + schema = loader.getSchema( "nis" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "nis" ); //assertTrue( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "inetorgperson" ); + schema = loader.getSchema( "inetorgperson" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "inetorgperson" ); assertFalse( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "system" ); + schema = loader.getSchema( "system" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "system" ); assertFalse( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; - schema = schemas.get( "apachemeta" ); + schema = loader.getSchema( "apachemeta" ); assertNotNull( schema ); assertEquals( schema.getSchemaName(), "apachemeta" ); assertFalse( schema.isDisabled() ); assertEquals( schema.getOwner(), "uid=admin,ou=system" ); schema = null; } - - - @Test public void testGetSchemaNames() throws Exception - { - PartitionSchemaLoader loader = new PartitionSchemaLoader( schemaPartition, schemaManager ); - Set schemaNames = loader.getSchemaNames(); - assertTrue( schemaNames.contains( "mozilla" ) ); - assertTrue( schemaNames.contains( "core" ) ); - assertTrue( schemaNames.contains( "apachedns" ) ); - assertTrue( schemaNames.contains( "autofs" ) ); - assertTrue( schemaNames.contains( "apache" ) ); - assertTrue( schemaNames.contains( "cosine" ) ); - assertTrue( schemaNames.contains( "krb5kdc" ) ); - assertTrue( schemaNames.contains( "samba" ) ); - assertTrue( schemaNames.contains( "collective" ) ); - assertTrue( schemaNames.contains( "java" ) ); - assertTrue( schemaNames.contains( "dhcp" ) ); - assertTrue( schemaNames.contains( "corba" ) ); - assertTrue( schemaNames.contains( "nis" ) ); - assertTrue( schemaNames.contains( "inetorgperson" ) ); - assertTrue( schemaNames.contains( "system" ) ); - assertTrue( schemaNames.contains( "apachemeta" ) ); - } }