Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 82382 invoked from network); 15 Dec 2009 04:31:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Dec 2009 04:31:22 -0000 Received: (qmail 75821 invoked by uid 500); 15 Dec 2009 04:31:22 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 75743 invoked by uid 500); 15 Dec 2009 04:31:20 -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 75734 invoked by uid 99); 15 Dec 2009 04:31:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Dec 2009 04:31:20 +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, 15 Dec 2009 04:31:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B048A23889ED; Tue, 15 Dec 2009 04:30:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r890638 - /directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java Date: Tue, 15 Dec 2009 04:30:57 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091215043057.B048A23889ED@eris.apache.org> Author: kayyagari Date: Tue Dec 15 04:30:57 2009 New Revision: 890638 URL: http://svn.apache.org/viewvc?rev=890638&view=rev Log: o added tests for MR deletion 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=890638&r1=890637&r2=890638&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 Tue Dec 15 04:30:57 2009 @@ -38,6 +38,7 @@ import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.LdapComparator; import org.apache.directory.shared.ldap.schema.LdapSyntax; +import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.Normalizer; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.SyntaxChecker; @@ -347,7 +348,51 @@ //========================================================================= // MatchingRule deletion tests //------------------------------------------------------------------------- - // TODO + + @Test + public void testDeleteExistingMatchingRule() throws Exception + { + SchemaManager schemaManager = loadSchema( "system" ); + int mrSize = schemaManager.getMatchingRuleRegistry().size(); + int goidSize = schemaManager.getOidRegistry().size(); + + MatchingRule mr = new MatchingRule( "2.5.13.33" ); + assertTrue( schemaManager.delete( mr ) ); + + assertEquals( mrSize - 1, schemaManager.getMatchingRuleRegistry().size() ); + assertEquals( goidSize - 1, schemaManager.getOidRegistry().size() ); + } + + + @Test + public void testDeleteNonExistingMatchingRule() throws Exception + { + SchemaManager schemaManager = loadSchema( "system" ); + int mrSize = schemaManager.getMatchingRuleRegistry().size(); + int goidSize = schemaManager.getOidRegistry().size(); + + MatchingRule mr = new MatchingRule( "0.1.1" ); + assertFalse( schemaManager.delete( mr ) ); + + assertEquals( mrSize, schemaManager.getMatchingRuleRegistry().size() ); + assertEquals( goidSize, schemaManager.getOidRegistry().size() ); + } + + + @Test + public void testDeleteExistingMatchingRuleUsedByAttributeType() throws Exception + { + SchemaManager schemaManager = loadSchema( "system" ); + int mrSize = schemaManager.getMatchingRuleRegistry().size(); + int goidSize = schemaManager.getOidRegistry().size(); + + // AT with OID 2.5.18.4 has syntax 1.3.6.1.4.1.1466.115.121.1.12 which is used by MR 2.5.13.1 + MatchingRule mr = new MatchingRule( "2.5.13.1" ); + assertFalse( schemaManager.delete( mr ) ); + + assertEquals( mrSize, schemaManager.getMatchingRuleRegistry().size() ); + assertEquals( goidSize, schemaManager.getOidRegistry().size() ); + } //========================================================================= // MatchingRuleUse deletion tests