From commits-return-24248-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Sun Jan 03 02:40:46 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 35358 invoked from network); 3 Jan 2010 02:40:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Jan 2010 02:40:46 -0000 Received: (qmail 26720 invoked by uid 500); 3 Jan 2010 02:40:46 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 26663 invoked by uid 500); 3 Jan 2010 02:40:46 -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 26654 invoked by uid 99); 3 Jan 2010 02:40:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jan 2010 02:40:45 +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; Sun, 03 Jan 2010 02:40:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C1DC623889D2; Sun, 3 Jan 2010 02:40:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r895327 - /directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java Date: Sun, 03 Jan 2010 02:40:19 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100103024021.C1DC623889D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sun Jan 3 02:40:16 2010 New Revision: 895327 URL: http://svn.apache.org/viewvc?rev=895327&view=rev Log: Added tests for escaped DN Modified: directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java Modified: directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java?rev=895327&r1=895326&r2=895327&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java (original) +++ directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java Sun Jan 3 02:40:16 2010 @@ -3588,4 +3588,89 @@ assertEquals( " ou = TEST ", atav.getUpName() ); } } + + + @Test + public void testNormalizeAsciiWithEscaped() throws Exception + { + LdapDN dn = new LdapDN( " ou = Ex\\+mple , ou = COM " ); + + dn.normalize( oidOids ); + assertEquals( "2.5.4.11=ex\\+mple,2.5.4.11=com", dn.getNormName() ); + assertEquals( " ou = Ex\\+mple , ou = COM ", dn.getUpName() ); + + Rdn rdn = dn.getRdn(); + assertEquals( "2.5.4.11", rdn.getNormType() ); + assertEquals( "ex+mple",rdn.getNormValue() ); + assertEquals( "2.5.4.11=ex\\+mple", rdn.getNormName() ); + assertEquals( "ou", rdn.getUpType() ); + assertEquals( "Ex\\+mple",rdn.getUpValue() ); + assertEquals( " ou = Ex\\+mple ", rdn.getUpName() ); + + AttributeTypeAndValue atav = rdn.getAtav(); + + assertEquals( "2.5.4.11=ex\\+mple", atav.getNormName() ); + assertEquals( "2.5.4.11", atav.getNormType() ); + assertEquals( "ex+mple", atav.getNormValue().get() ); + + assertEquals( "ou", atav.getUpType() ); + assertEquals( "Ex\\+mple", atav.getUpValue().get() ); + + // Wrong !!! TODO : fix me + //assertEquals( " ou = Ex\\+mple ", atav.getUpName() ); + } + + + @Test + public void testNormalizeAsciiCompositeWithEscaped() throws Exception + { + LdapDN dn = new LdapDN( " ou = Ex\\+mple + ou = T\\+ST , ou = COM " ); + + dn.normalize( oidOids ); + assertEquals( "2.5.4.11=ex\\+mple+2.5.4.11=t\\+st,2.5.4.11=com", dn.getNormName() ); + assertEquals( " ou = Ex\\+mple + ou = T\\+ST , ou = COM ", dn.getUpName() ); + + Rdn rdn = dn.getRdn(); + assertEquals( "2.5.4.11", rdn.getNormType() ); + // TODO: Wrong !!! Fixme + //assertEquals( "ex+mple",rdn.getNormValue() ); + assertEquals( "2.5.4.11=ex\\+mple+2.5.4.11=t\\+st", rdn.getNormName() ); + assertEquals( "ou", rdn.getUpType() ); + assertEquals( "Ex\\+mple",rdn.getUpValue() ); + assertEquals( " ou = Ex\\+mple + ou = T\\+ST ", rdn.getUpName() ); + + // The first ATAV + AttributeTypeAndValue atav = rdn.getAtav(); + + // TODO: Wrong !!! Fixme + //assertEquals( "2.5.4.11=ex+mple", atav.getNormName() ); + assertEquals( "2.5.4.11", atav.getNormType() ); + assertEquals( "ex+mple", atav.getNormValue().get() ); + + assertEquals( "ou", atav.getUpType() ); + assertEquals( "Ex\\+mple", atav.getUpValue().get() ); + + // Wrong !!! TODO : fix me + //assertEquals( " ou = Ex\\+mple ", atav.getUpName() ); + + assertEquals( 2, rdn.getNbAtavs() ); + + // The second ATAV + for ( AttributeTypeAndValue ava : rdn ) + { + if ( "ex+mple".equals( atav.getNormValue().get() ) ) + { + // Skip the first one + continue; + } + + assertEquals( "2.5.4.11=t+st", atav.getNormName() ); + assertEquals( "2.5.4.11", atav.getNormType() ); + assertEquals( "t+st", atav.getNormValue().get() ); + + assertEquals( "ou", atav.getUpType() ); + assertEquals( "T\\+ST", atav.getUpValue().get() ); + assertEquals( " ou = T\\+ST ", atav.getUpName() ); + } + } }