Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 4854 invoked from network); 14 Dec 2009 18:22:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Dec 2009 18:22:02 -0000 Received: (qmail 67940 invoked by uid 500); 14 Dec 2009 18:22:02 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 67874 invoked by uid 500); 14 Dec 2009 18:22:01 -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 67865 invoked by uid 99); 14 Dec 2009 18:22:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Dec 2009 18:22:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 14 Dec 2009 18:21:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8C5EA2388A31; Mon, 14 Dec 2009 18:21:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r890425 - /directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java Date: Mon, 14 Dec 2009 18:21:37 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091214182138.8C5EA2388A31@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Mon Dec 14 18:21:35 2009 New Revision: 890425 URL: http://svn.apache.org/viewvc?rev=890425&view=rev Log: added test cases dealing with deletion of Comparators Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java?rev=890425&r1=890424&r2=890425&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java (original) +++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java Mon Dec 14 18:21:35 2009 @@ -22,6 +22,7 @@ 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 java.io.File; @@ -33,12 +34,15 @@ import org.apache.commons.io.FileUtils; import org.apache.directory.shared.ldap.schema.AttributeType; +import org.apache.directory.shared.ldap.schema.LdapComparator; import org.apache.directory.shared.ldap.schema.SchemaManager; +import org.apache.directory.shared.ldap.schema.comparators.BooleanComparator; 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.LdifSchemaLoader; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; @@ -247,10 +251,71 @@ assertEquals( goidSize, schemaManager.getOidRegistry().size() ); } + //========================================================================= // Comparator deletion tests //------------------------------------------------------------------------- - // TODO + + @Ignore("lookup of newly added comparator is failing") + @Test + public void testDeleteExistingComaparator() throws Exception + { + SchemaManager schemaManager = loadSchema( "system" ); + int ctrSize = schemaManager.getComparatorRegistry().size(); + int goidSize = schemaManager.getOidRegistry().size(); + + LdapComparator lc = new BooleanComparator( "0.1.1" ); + assertTrue( schemaManager.add( lc ) ); + + assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() ); + assertEquals( goidSize, schemaManager.getOidRegistry().size() ); + + // FIXME this lookup is failing ! but it shouldn't be + lc = schemaManager.lookupComparatorRegistry( "0.1.1" ); + assertNotNull( lc ); + assertTrue( schemaManager.delete( lc ) ); + + assertEquals( ctrSize, schemaManager.getComparatorRegistry().size() ); + assertEquals( goidSize, schemaManager.getOidRegistry().size() ); + } + + + @Test + public void testDeleteNonExistingComaparator() throws Exception + { + SchemaManager schemaManager = loadSchema( "system" ); + int ctrSize = schemaManager.getComparatorRegistry().size(); + int goidSize = schemaManager.getOidRegistry().size(); + + LdapComparator lc = new BooleanComparator( "0.0" ); + assertFalse( schemaManager.delete( lc ) ); + + List errors = schemaManager.getErrors(); + assertFalse( errors.isEmpty() ); + + assertEquals( ctrSize, schemaManager.getComparatorRegistry().size() ); + assertEquals( goidSize, schemaManager.getOidRegistry().size() ); + } + + + @Test + public void testDeleteExistingComaparatorUsedByMatchingRule() throws Exception + { + SchemaManager schemaManager = loadSchema( "system" ); + int ctrSize = schemaManager.getComparatorRegistry().size(); + int goidSize = schemaManager.getOidRegistry().size(); + + LdapComparator lc = schemaManager.lookupComparatorRegistry( "2.5.13.0" ); + // shouldn't be deleted cause there is a MR associated with it + assertFalse( schemaManager.delete( lc ) ); + + List errors = schemaManager.getErrors(); + assertFalse( errors.isEmpty() ); + + assertNotNull( schemaManager.lookupComparatorRegistry( "2.5.13.0" ) ); + assertEquals( ctrSize, schemaManager.getComparatorRegistry().size() ); + assertEquals( goidSize, schemaManager.getOidRegistry().size() ); + } //========================================================================= // DITContentRule deletion tests