Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 13094 invoked from network); 17 Aug 2006 00:50:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Aug 2006 00:50:16 -0000 Received: (qmail 40694 invoked by uid 500); 17 Aug 2006 00:50:16 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 40631 invoked by uid 500); 17 Aug 2006 00:50:16 -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 40620 invoked by uid 99); 17 Aug 2006 00:50:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Aug 2006 17:50:16 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Aug 2006 17:50:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 32BA21A981D; Wed, 16 Aug 2006 17:49:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r432087 - in /directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server: AddITest.java ModifyAddTest.java Date: Thu, 17 Aug 2006 00:49:54 -0000 To: commits@directory.apache.org From: ersiner@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060817004955.32BA21A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ersiner Date: Wed Aug 16 17:49:54 2006 New Revision: 432087 URL: http://svn.apache.org/viewvc?rev=432087&view=rev Log: Test cases for DIRSERVER-614 Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java?rev=432087&r1=432086&r2=432087&view=diff ============================================================================== --- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java (original) +++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddITest.java Wed Aug 16 17:49:54 2006 @@ -325,4 +325,34 @@ con.delete( dn ); con.disconnect(); } + + /** + * Try to add entry with invalid number of values for a single-valued atribute + * @see http://issues.apache.org/jira/browse/DIRSERVER-614 + */ + public void testAddWithInvalidNumberOfAttributeValues() throws NamingException + { + // add inetOrgPerson with two displayNames + Attributes attrs = new BasicAttributes(); + Attribute ocls = new BasicAttribute( "objectClass" ); + ocls.add( "top" ); + ocls.add( "inetOrgPerson" ); + attrs.put( ocls ); + attrs.put( "cn", "Fiona Apple" ); + attrs.put( "sn", "Apple" ); + Attribute displayName = new BasicAttribute( "displayName" ); + displayName.add( "Fiona" ); + displayName.add( "Fiona A." ); + attrs.put( displayName ); + + try + { + ctx.createSubcontext( "cn=Fiona Apple", attrs ); + fail( "creation of entry should fail" ); + } + catch ( InvalidAttributeValueException e ) + { + + } + } } Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java?rev=432087&r1=432086&r2=432087&view=diff ============================================================================== --- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java (original) +++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java Wed Aug 16 17:49:54 2006 @@ -29,6 +29,7 @@ import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; import javax.naming.directory.InvalidAttributeIdentifierException; +import javax.naming.directory.InvalidAttributeValueException; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; @@ -508,4 +509,37 @@ fail(); } */ + + /** + * Try to modify an entry adding invalid number of values for a single-valued atribute + * @see http://issues.apache.org/jira/browse/DIRSERVER-614 + */ + public void testModifyAddWithInvalidNumberOfAttributeValues() throws NamingException + { + Attributes attrs = new BasicAttributes(); + Attribute ocls = new BasicAttribute( "objectClass" ); + ocls.add( "top" ); + ocls.add( "inetOrgPerson" ); + attrs.put( ocls ); + attrs.put( "cn", "Fiona Apple" ); + attrs.put( "sn", "Apple" ); + ctx.createSubcontext( "cn=Fiona Apple", attrs ); + + // add two displayNames to an inetOrgPerson + attrs = new BasicAttributes(); + Attribute displayName = new BasicAttribute( "displayName" ); + displayName.add( "Fiona" ); + displayName.add( "Fiona A." ); + attrs.put( displayName ); + + try + { + ctx.modifyAttributes( "cn=Fiona Apple", DirContext.ADD_ATTRIBUTE, attrs ); + fail( "modification of entry should fail" ); + } + catch ( InvalidAttributeValueException e ) + { + + } + } }