Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 270 invoked from network); 12 Dec 2005 09:12:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Dec 2005 09:12:35 -0000 Received: (qmail 94512 invoked by uid 500); 12 Dec 2005 09:12:31 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 94460 invoked by uid 500); 12 Dec 2005 09:12:31 -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 94448 invoked by uid 99); 12 Dec 2005 09:12:31 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Dec 2005 01:12:31 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 12 Dec 2005 01:12:30 -0800 Received: (qmail 99892 invoked by uid 65534); 12 Dec 2005 09:12:10 -0000 Message-ID: <20051212091210.99890.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r356226 - /directory/shared/ldap/branches/DN-refactoring/common/src/test/org/apache/ldap/common/name/LdapDNTest.java Date: Mon, 12 Dec 2005 09:12:09 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: elecharny Date: Mon Dec 12 01:12:06 2005 New Revision: 356226 URL: http://svn.apache.org/viewcvs?rev=356226&view=rev Log: Fixed the tests to reflect the modification done in LdapDN and RDNParser, related to user provided DN. Modified: directory/shared/ldap/branches/DN-refactoring/common/src/test/org/apache/ldap/common/name/LdapDNTest.java Modified: directory/shared/ldap/branches/DN-refactoring/common/src/test/org/apache/ldap/common/name/LdapDNTest.java URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/DN-refactoring/common/src/test/org/apache/ldap/common/name/LdapDNTest.java?rev=356226&r1=356225&r2=356226&view=diff ============================================================================== --- directory/shared/ldap/branches/DN-refactoring/common/src/test/org/apache/ldap/common/name/LdapDNTest.java (original) +++ directory/shared/ldap/branches/DN-refactoring/common/src/test/org/apache/ldap/common/name/LdapDNTest.java Mon Dec 12 01:12:06 2005 @@ -203,7 +203,7 @@ LdapDN dn = new LdapDN( "a=b, c=d, e=f" ); Assert.assertEquals( "e=f", dn.remove( 0 ).toString() ); Assert.assertEquals( "a=b,c=d", dn.toString() ); - Assert.assertEquals( "a=b,c=d", dn.getName() ); + Assert.assertEquals( "a=b, c=d", dn.getName() ); } /** @@ -213,7 +213,7 @@ { LdapDN dn = new LdapDN( "a=b, c=d, e=f" ); Assert.assertEquals( "c=d", dn.remove( 1 ).toString() ); - Assert.assertEquals( "a=b,e=f", dn.getName() ); + Assert.assertEquals( "a=b, e=f", dn.getName() ); } /** @@ -223,7 +223,7 @@ { LdapDN dn = new LdapDN( "a=b, c=d, e=f" ); Assert.assertEquals( "a=b", dn.remove( 2 ).toString() ); - Assert.assertEquals( "c=d,e=f", dn.getName() ); + Assert.assertEquals( " c=d, e=f", dn.getName() ); } /** @@ -233,7 +233,7 @@ { LdapDN dn = new LdapDN( "a=b, c=d; e=f" ); Assert.assertEquals( "c=d", dn.remove( 1 ).toString() ); - Assert.assertEquals( "a=b,e=f", dn.getName() ); + Assert.assertEquals( "a=b, e=f", dn.getName() ); } /** @@ -323,7 +323,7 @@ dn.add( "e = f" ); Assert.assertEquals( "e=f" , dn.toString() ); - Assert.assertEquals( "e=f" , dn.getName() ); + Assert.assertEquals( "e = f" , dn.getName() ); Assert.assertEquals( 1, dn.size() ); } @@ -336,7 +336,7 @@ dn.add( "e = f" ); Assert.assertEquals( "e=f,a=b,c=d" , dn.toString() ); - Assert.assertEquals( "e=f,a=b,c=d" , dn.getName() ); + Assert.assertEquals( "e = f,a=b, c=d" , dn.getName() ); Assert.assertEquals( 3, dn.size() ); } @@ -364,7 +364,7 @@ LdapDN dn = new LdapDN( "a=b, c=d"); dn.add( dn.size(), "e = f" ); - Assert.assertEquals( "e=f,a=b,c=d" , dn.getName() ); + Assert.assertEquals( "e = f,a=b, c=d" , dn.getName() ); Assert.assertEquals( 3, dn.size() ); } @@ -376,7 +376,7 @@ LdapDN dn = new LdapDN( "a=b, c=d"); dn.add( 0, "e = f" ); - Assert.assertEquals( "a=b,c=d,e=f" , dn.getName() ); + Assert.assertEquals( "a=b, c=d,e = f" , dn.getName() ); Assert.assertEquals( 3, dn.size() ); } @@ -388,7 +388,7 @@ LdapDN dn = new LdapDN( "a=b, c=d"); dn.add( 1, "e = f" ); - Assert.assertEquals( "a=b,e=f,c=d" , dn.getName() ); + Assert.assertEquals( "a=b,e = f, c=d" , dn.getName() ); Assert.assertEquals( 3, dn.size() ); } @@ -402,7 +402,7 @@ LdapDN dn = new LdapDN( "a = b" ); LdapDN dn2 = new LdapDN( "c = d" ); dn.addAll( dn2 ); - Assert.assertEquals( "c=d,a=b", dn.getName() ); + Assert.assertEquals( "c = d,a = b", dn.getName() ); } /** @@ -427,7 +427,7 @@ LdapDN dn = new LdapDN(); LdapDN dn2 = new LdapDN( "a = b" ); dn.addAll( dn2 ); - Assert.assertEquals( "a=b", dn.getName() ); + Assert.assertEquals( "a = b", dn.getName() ); } /** @@ -439,7 +439,7 @@ LdapDN dn = new LdapDN( "a = b" ); LdapDN dn2 = new LdapDN( "c = d" ); dn.addAll( 0, dn2 ); - Assert.assertEquals( "a=b,c=d", dn.getName() ); + Assert.assertEquals( "a = b,c = d", dn.getName() ); } /** @@ -451,7 +451,7 @@ LdapDN dn = new LdapDN( "a = b" ); LdapDN dn2 = new LdapDN( "c = d" ); dn.addAll( 1, dn2 ); - Assert.assertEquals( "c=d,a=b", dn.getName() ); + Assert.assertEquals( "c = d,a = b", dn.getName() ); } /** @@ -463,7 +463,7 @@ LdapDN dn = new LdapDN( "a = b, c = d" ); LdapDN dn2 = new LdapDN( "e = f" ); dn.addAll( 1, dn2 ); - Assert.assertEquals( "a=b,e=f,c=d", dn.getName() ); + Assert.assertEquals( "a = b,e = f, c = d", dn.getName() ); } /** @@ -488,7 +488,7 @@ LdapDN dn = new LdapDN(); LdapDN dn2 = new LdapDN( "a = b" ); dn.addAll( 0, dn2 ); - Assert.assertEquals( "a=b", dn.getName() ); + Assert.assertEquals( "a = b", dn.getName() ); } // GET PREFIX actions @@ -499,7 +499,7 @@ { LdapDN dn = new LdapDN( "a=b, c=d,e = f" ); LdapDN newDn = ((LdapDN)dn.getPrefix( 0 )); - Assert.assertEquals( "", newDn.getName() ); + Assert.assertEquals( "", newDn.getName() ); } /** @@ -509,7 +509,7 @@ { LdapDN dn = new LdapDN( "a=b, c=d,e = f" ); LdapDN newDn = ((LdapDN)dn.getPrefix( 1 )); - Assert.assertEquals( "e=f", newDn.getName() ); + Assert.assertEquals( "e = f", newDn.getName() ); } /** @@ -519,7 +519,7 @@ { LdapDN dn = new LdapDN( "a=b, c=d,e = f" ); LdapDN newDn = ((LdapDN)dn.getPrefix( 2 )); - Assert.assertEquals( "c=d,e=f", newDn.getName() ); + Assert.assertEquals( " c=d,e = f", newDn.getName() ); } /** @@ -529,7 +529,7 @@ { LdapDN dn = new LdapDN( "a=b, c=d,e = f" ); LdapDN newDn = ((LdapDN)dn.getPrefix( 3 )); - Assert.assertEquals( "a=b,c=d,e=f", newDn.getName() ); + Assert.assertEquals( "a=b, c=d,e = f", newDn.getName() ); } /** @@ -569,7 +569,7 @@ { LdapDN dn = new LdapDN( "a=b, c=d,e = f" ); LdapDN newDn = ((LdapDN)dn.getSuffix( 0 )); - Assert.assertEquals( "a=b,c=d,e=f", newDn.getName() ); + Assert.assertEquals( "a=b, c=d,e = f", newDn.getName() ); } /** @@ -579,7 +579,7 @@ { LdapDN dn = new LdapDN( "a=b, c=d,e = f" ); LdapDN newDn = ((LdapDN)dn.getSuffix( 1 )); - Assert.assertEquals( "a=b,c=d", newDn.getName() ); + Assert.assertEquals( "a=b, c=d", newDn.getName() ); } /** @@ -1026,8 +1026,8 @@ public void testNameComparisonIsInsensitiveToAttributesOrderFailure() throws Exception { - Name name1 = new LdapDN( "cn=HomeDir+cn=Workdir" ); - Name name2 = new LdapDN( "cn=Work+cn=HomeDir" ); + Name name1 = new LdapDN( "cn= HomeDir+cn=Workdir" ); + Name name2 = new LdapDN( "cn = Work+cn=HomeDir" ); assertEquals( -1, name1.compareTo( name2 ) ); }