directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [24/32] - in /directory: apacheds-manuals/trunk/src/advanced-user-guide/ apacheds-manuals/trunk/src/basic-user-guide/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/s...
Date Sun, 23 Jan 2011 01:17:26 GMT
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java Sun Jan 23 01:17:06 2011
@@ -43,8 +43,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -81,7 +81,7 @@ public class LdifRevertorTest
     @Test
     public void testReverseAdd() throws LdapInvalidDnException
     {
-        DN dn = new DN( "dc=apache, dc=com" );
+        Dn dn = new Dn( "dc=apache, dc=com" );
         LdifEntry reversed = LdifRevertor.reverseAdd( dn );
         
         assertNotNull( reversed );
@@ -98,7 +98,7 @@ public class LdifRevertorTest
     @Test
     public void testReverseDel() throws LdapException
     {
-        DN dn = new DN( "dc=apache, dc=com" );
+        Dn dn = new Dn( "dc=apache, dc=com" );
         
         Entry deletedEntry = new DefaultEntry( dn );
         
@@ -133,7 +133,7 @@ public class LdifRevertorTest
         ou.add( "apache", "acme corp" );
         modifiedEntry.put( ou );
 
-        DN dn = new DN( "cn=test, ou=system" );
+        Dn dn = new Dn( "cn=test, ou=system" );
 
         Modification mod = new DefaultModification( 
             ModificationOperation.REMOVE_ATTRIBUTE, 
@@ -177,7 +177,7 @@ public class LdifRevertorTest
         ou.add( "apache", "acme corp" );
         modifiedEntry.put( ou );
 
-        DN dn = new DN( "cn=test, ou=system" );
+        Dn dn = new Dn( "cn=test, ou=system" );
 
         Modification mod = new DefaultModification(
             ModificationOperation.REMOVE_ATTRIBUTE, 
@@ -221,7 +221,7 @@ public class LdifRevertorTest
         EntryAttribute ou = new DefaultEntryAttribute( "ou", "apache", "acme corp" );
         modifiedEntry.put( ou );
         
-        DN dn = new DN( "cn=test, ou=system" );
+        Dn dn = new Dn( "cn=test, ou=system" );
         
         Modification mod = new DefaultModification(
             ModificationOperation.REMOVE_ATTRIBUTE, ou );
@@ -265,7 +265,7 @@ public class LdifRevertorTest
         ou.add( "apache", "acme corp" );
         modifiedEntry.put( ou );
 
-        DN dn = new DN( "cn=test, ou=system" );
+        Dn dn = new Dn( "cn=test, ou=system" );
 
         EntryAttribute ouModified = new DefaultEntryAttribute( "ou" );
         ouModified.add( "directory" );
@@ -308,7 +308,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
         
-        DN dn = new DN( "cn=test, ou=system" );
+        Dn dn = new Dn( "cn=test, ou=system" );
         
         EntryAttribute newOu = new DefaultEntryAttribute( "ou" );
         newOu.add( "apache" );
@@ -357,7 +357,7 @@ public class LdifRevertorTest
         ou.add( "acme corp" );
         modifiedEntry.put( ou );
         
-        DN dn = new DN( "cn=test, ou=system" );
+        Dn dn = new Dn( "cn=test, ou=system" );
         
         Modification mod = new DefaultModification( 
             ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "ou" ) );
@@ -483,7 +483,7 @@ public class LdifRevertorTest
         //   - add the 'l=FR' attribute
         //   - replace the 'l=FR' by a 'l=USA' attribute
         //   - replace the 'ou' attribute with 'apache' value.
-        DN dn = new DN( "cn=test, ou=system" );
+        Dn dn = new Dn( "cn=test, ou=system" );
         
         List<Modification> modifications = new ArrayList<Modification>();
 
@@ -560,7 +560,7 @@ public class LdifRevertorTest
         ou.add( "acme corp" );
         modifiedEntry.put( ou );
         
-        DN dn = new DN( "cn=test, ou=system" );
+        Dn dn = new Dn( "cn=test, ou=system" );
         Modification mod = new DefaultModification(
             ModificationOperation.ADD_ATTRIBUTE, 
             new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
@@ -597,7 +597,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
         
-        DN dn = new DN( "cn=test, ou=system" );
+        Dn dn = new Dn( "cn=test, ou=system" );
         Modification mod = new DefaultModification(
             ModificationOperation.ADD_ATTRIBUTE, 
             new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
@@ -627,14 +627,14 @@ public class LdifRevertorTest
     
     
     /**
-     * Test a AddRequest reverse where the DN is to be base64 encoded 
+     * Test a AddRequest reverse where the Dn is to be base64 encoded
      *
      * @throws LdapException
      */
     @Test
     public void testReverseAddBase64DN() throws LdapException
     {
-        DN dn = new DN( "dc=Emmanuel L\u00c9charny" );
+        Dn dn = new Dn( "dc=Emmanuel L\u00c9charny" );
         LdifEntry reversed = LdifRevertor.reverseAdd( dn );
         assertNotNull( reversed );
         assertEquals( dn.getName(), reversed.getDn().getName() );
@@ -651,9 +651,9 @@ public class LdifRevertorTest
     @Test
     public void testReverseModifyDNMove() throws LdapException
     {
-        DN dn = new DN( "cn=john doe, dc=example, dc=com" );
-        DN newSuperior = new DN( "ou=system" );
-        RDN rdn = new RDN( "cn=john doe" );
+        Dn dn = new Dn( "cn=john doe, dc=example, dc=com" );
+        Dn newSuperior = new Dn( "ou=system" );
+        Rdn rdn = new Rdn( "cn=john doe" );
 
         Attributes attrs = new BasicAttributes( "objectClass", "person", true );
         attrs.get( "objectClass" ).add( "uidObject" );
@@ -676,8 +676,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the RDN are both simple, not overlapping,
-     * with deleteOldRdn = false, and the AVA not present in the initial entry?
+     * Test a reversed rename ModifyDN, where the Rdn are both simple, not overlapping,
+     * with deleteOldRdn = false, and the Ava not present in the initial entry?
      * 
      * Covers case 1.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -688,16 +688,16 @@ public class LdifRevertorTest
      * cn: test
      * sn: This is a test 
      * 
-     * new RDN : cn=joe
+     * new Rdn : cn=joe
      *
      * @throws LdapException on error
      */
     @Test
     public void test11ReverseRenameSimpleSimpleNotOverlappingKeepOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=joe" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test" );
@@ -719,8 +719,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the RDN are both simple, not overlapping,
-     * with deleteOldRdn = false, and with a AVA present in the initial entry.
+     * Test a reversed rename ModifyDN, where the Rdn are both simple, not overlapping,
+     * with deleteOldRdn = false, and with a Ava present in the initial entry.
      * 
      * Covers case 1.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -732,16 +732,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=small
+     * new Rdn : cn=small
      *
      * @throws LdapException on error
      */
     @Test
     public void test12ReverseRenameSimpleSimpleNotOverlappingKeepOldRdnExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=small" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=small" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -763,8 +763,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the RDN are both simple, not overlapping,
-     * with deleteOldRdn = true, and the AVA not present in the initial entry
+     * Test a reversed rename ModifyDN, where the Rdn are both simple, not overlapping,
+     * with deleteOldRdn = true, and the Ava not present in the initial entry
      * 
      * Covers case 2.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -775,16 +775,16 @@ public class LdifRevertorTest
      * cn: test
      * sn: This is a test 
      * 
-     * new RDN : cn=joe
+     * new Rdn : cn=joe
      *
      * @throws LdapException on error
      */
     @Test
     public void test21ReverseRenameSimpleSimpleNotOverlappingDeleteOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=joe" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test" );
@@ -806,8 +806,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the RDN are both simple, not overlapping,
-     * with deleteOldRdn = true, and with a AVA present in the initial entry.
+     * Test a reversed rename ModifyDN, where the Rdn are both simple, not overlapping,
+     * with deleteOldRdn = true, and with a Ava present in the initial entry.
      * 
      * Covers case 2.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -819,16 +819,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=small
+     * new Rdn : cn=small
      *
      * @throws LdapException on error
      */
     @Test
     public void test22ReverseRenameSimpleSimpleNotOverlappingDeleteOldRdnExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=small" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=small" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -850,9 +850,9 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is simple, not overlapping, with deleteOldRdn = false, and 
-     * with a AVA not present in the initial entry.
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is simple, not overlapping, with deleteOldRdn = false, and
+     * with a Ava not present in the initial entry.
      * 
      * Covers case 3 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -864,16 +864,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=joe
+     * new Rdn : cn=joe
      *
      * @throws LdapException on error
      */
     @Test
     public void test3ReverseRenameCompositeSimpleNotOverlappingKeepOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=joe" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -895,9 +895,9 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is simple, not overlapping, with deleteOldRdn = false, and 
-     * with an AVA present in the initial entry.
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is simple, not overlapping, with deleteOldRdn = false, and
+     * with an Ava present in the initial entry.
      * 
      * Covers case 3 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -910,16 +910,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=big
+     * new Rdn : cn=big
      *
      * @throws LdapException on error
      */
     @Test
     public void test3ReverseRenameCompositeSimpleNotOverlappingKeepOldRdnExistsInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=big" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=big" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small", "big" );
@@ -941,9 +941,9 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is simple, not overlapping, with deleteOldRdn = true, and 
-     * with an AVA not present in the initial entry.
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is simple, not overlapping, with deleteOldRdn = true, and
+     * with an Ava not present in the initial entry.
      * 
      * Covers case 4 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -955,16 +955,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=joe
+     * new Rdn : cn=joe
      *
      * @throws LdapException on error
      */
     @Test
     public void test4ReverseRenameCompositeSimpleNotOverlappingDeleteOldRdnDontExistsInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=joe" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -986,9 +986,9 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is simple, not overlapping, with deleteOldRdn = true, and 
-     * with an AVA present in the initial entry.
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is simple, not overlapping, with deleteOldRdn = true, and
+     * with an Ava present in the initial entry.
      * 
      * Covers case 4 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -1001,16 +1001,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=big
+     * new Rdn : cn=big
      *
      * @throws LdapException on error
      */
     @Test
     public void test4ReverseRenameCompositeSimpleNotOverlappingDeleteOldRdnExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=big" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=big" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small", "big" );
@@ -1032,8 +1032,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is simple, they overlap, with deleteOldRdn = false.
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is simple, they overlap, with deleteOldRdn = false.
      * 
      * Covers case 5 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -1045,16 +1045,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=test
+     * new Rdn : cn=test
      *
      * @throws LdapException on error
      */
     @Test
     public void test5ReverseRenameCompositeSimpleOverlappingKeepOldRdn() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=test" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=test" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -1076,8 +1076,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is simple, they overlap, with deleteOldRdn = true.
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is simple, they overlap, with deleteOldRdn = true.
      * 
      * Covers case 5 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
      * 
@@ -1089,16 +1089,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=test
+     * new Rdn : cn=test
      *
      * @throws LdapException on error
      */
     @Test
     public void test5ReverseRenameCompositeSimpleOverlappingDeleteOldRdn() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=test" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=test" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -1120,8 +1120,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is simple, 
-     * the new RDN is composite, they don't overlap, with deleteOldRdn = false, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is simple,
+     * the new Rdn is composite, they don't overlap, with deleteOldRdn = false, and
      * the new values don't exist in the entry.
      * 
      * Covers case 6.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1134,16 +1134,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=plumber
+     * new Rdn : cn=joe+cn=plumber
      *
      * @throws LdapException on error
      */
     @Test
     public void test61ReverseRenameSimpleCompositeNotOverlappingKeepOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=plumber" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=plumber" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -1165,8 +1165,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is simple, 
-     * the new RDN is composite, they don't overlap, with deleteOldRdn = false, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is simple,
+     * the new Rdn is composite, they don't overlap, with deleteOldRdn = false, and
      * the new values exists in the entry.
      * 
      * Covers case 6.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1179,16 +1179,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=small
+     * new Rdn : cn=joe+cn=small
      *
      * @throws LdapException on error
      */
     @Test
     public void test62ReverseRenameSimpleCompositeNotOverlappingKeepOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=small" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=small" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -1223,8 +1223,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is simple, 
-     * the new RDN is composite, they don't overlap, with deleteOldRdn = true, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is simple,
+     * the new Rdn is composite, they don't overlap, with deleteOldRdn = true, and
      * none of new values exists in the entry.
      * 
      * Covers case 7.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1237,16 +1237,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=plumber
+     * new Rdn : cn=joe+cn=plumber
      *
      * @throws LdapException on error
      */
     @Test
     public void test71ReverseRenameSimpleCompositeNotOverlappingDeleteOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=plumber" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=plumber" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -1268,8 +1268,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is simple, 
-     * the new RDN is composite, they don't overlap, with deleteOldRdn = true, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is simple,
+     * the new Rdn is composite, they don't overlap, with deleteOldRdn = true, and
      * some of new values exists in the entry.
      * 
      * Covers case 7.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1282,16 +1282,16 @@ public class LdifRevertorTest
      * cn: small
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=small
+     * new Rdn : cn=joe+cn=small
      *
      * @throws LdapException on error
      */
     @Test
     public void test72ReverseRenameSimpleCompositeNotOverlappingDeleteOldRdnExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=small" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=small" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "small" );
@@ -1326,8 +1326,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is simple, 
-     * the new RDN is composite, they overlap, with deleteOldRdn = false, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is simple,
+     * the new Rdn is composite, they overlap, with deleteOldRdn = false, and
      * none of new values exists in the entry.
      * 
      * Covers case 8.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1340,16 +1340,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=small+cn=test
+     * new Rdn : cn=small+cn=test
      *
      * @throws LdapException on error
      */
     @Test
     public void test81ReverseRenameSimpleCompositeOverlappingKeepOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=small+cn=test" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=small+cn=test" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big" );
@@ -1373,8 +1373,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is simple, 
-     * the new RDN is composite, they overlap, with deleteOldRdn = false, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is simple,
+     * the new Rdn is composite, they overlap, with deleteOldRdn = false, and
      * some of the new values exist in the entry.
      * 
      * Covers case 8.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1387,16 +1387,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=small+cn=test
+     * new Rdn : cn=small+cn=test
      *
      * @throws LdapException on error
      */
     @Test
     public void test82ReverseRenameSimpleCompositeOverlappingKeepOldRdnExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=small+cn=test+cn=big" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=small+cn=test+cn=big" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big" );
@@ -1431,8 +1431,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is simple, 
-     * the new RDN is composite, they overlap, with deleteOldRdn = true, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is simple,
+     * the new Rdn is composite, they overlap, with deleteOldRdn = true, and
      * none of new values exists in the entry.
      * 
      * Covers case 9.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1445,16 +1445,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=small+cn=test
+     * new Rdn : cn=small+cn=test
      *
      * @throws LdapException on error
      */
     @Test
     public void test91ReverseRenameSimpleCompositeOverlappingDeleteOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=small+cn=test" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=small+cn=test" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big" );
@@ -1476,8 +1476,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is simple, 
-     * the new RDN is composite, they overlap, with deleteOldRdn = true, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is simple,
+     * the new Rdn is composite, they overlap, with deleteOldRdn = true, and
      * some of the new values exists in the entry.
      * 
      * Covers case 9.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1490,16 +1490,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=small+cn=test+cn=big
+     * new Rdn : cn=small+cn=test+cn=big
      *
      * @throws LdapException on error
      */
     @Test
     public void test92ReverseRenameSimpleCompositeOverlappingDeleteOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=test" );
-        RDN newRdn = new RDN( "cn=small+cn=test+cn=big" );
+        Dn dn = new Dn( "cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=test" );
+        Rdn newRdn = new Rdn( "cn=small+cn=test+cn=big" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big" );
@@ -1534,8 +1534,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is composite, they don't overlap, with deleteOldRdn = false, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is composite, they don't overlap, with deleteOldRdn = false, and
      * none of new values exists in the entry.
      * 
      * Covers case 10.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1549,16 +1549,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=plumber
+     * new Rdn : cn=joe+cn=plumber
      *
      * @throws LdapException on error
      */
     @Test
     public void test101ReverseRenameCompositeCompositeNotOverlappingKeepOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=plumber" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=plumber" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big", "small" );
@@ -1580,8 +1580,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is composite, they don't overlap, with deleteOldRdn = false, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is composite, they don't overlap, with deleteOldRdn = false, and
      * some of the new values exists in the entry.
      * 
      * Covers case 10.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1595,16 +1595,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=big
+     * new Rdn : cn=joe+cn=big
      *
      * @throws LdapException on error
      */
     @Test
     public void test102ReverseRenameCompositeCompositeNotOverlappingKeepOldRdnExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=big" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=big" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big", "small" );
@@ -1639,8 +1639,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is composite, they don't overlap, with deleteOldRdn = true, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is composite, they don't overlap, with deleteOldRdn = true, and
      * none of new values exists in the entry.
      * 
      * Covers case 11.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1654,16 +1654,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=plumber
+     * new Rdn : cn=joe+cn=plumber
      *
      * @throws LdapException on error
      */
     @Test
     public void test111ReverseRenameCompositeCompositeNotOverlappingDeleteOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=plumber" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=plumber" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big", "small" );
@@ -1685,8 +1685,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is composite, they don't overlap, with deleteOldRdn = true, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is composite, they don't overlap, with deleteOldRdn = true, and
      * some of the new values exists in the entry.
      * 
      * Covers case 11.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1700,16 +1700,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=plumber
+     * new Rdn : cn=joe+cn=plumber
      *
      * @throws LdapException on error
      */
     @Test
     public void test112ReverseRenameCompositeCompositeNotOverlappingDeleteOldRdnExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=big" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=big" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big", "small" );
@@ -1744,8 +1744,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is composite, they are overlapping, with deleteOldRdn = false, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is composite, they are overlapping, with deleteOldRdn = false, and
      * none of new values exists in the entry.
      * 
      * Covers case 12.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1759,16 +1759,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=test
+     * new Rdn : cn=joe+cn=test
      *
      * @throws LdapException on error
      */
     @Test
     public void test121ReverseRenameCompositeCompositeOverlappingKeepOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=test" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=test" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big", "small" );
@@ -1790,8 +1790,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is composite, they are overlapping, with deleteOldRdn = false, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is composite, they are overlapping, with deleteOldRdn = false, and
      * some of the new values exists in the entry.
      * 
      * Covers case 12.2 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1805,16 +1805,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=test
+     * new Rdn : cn=joe+cn=test
      *
      * @throws LdapException on error
      */
     @Test
     public void test122ReverseRenameCompositeCompositeOverlappingKeepOldRdnExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=big+cn=test" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=big+cn=test" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big", "small" );
@@ -1836,8 +1836,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is composite, they are overlapping, with deleteOldRdn = true, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is composite, they are overlapping, with deleteOldRdn = true, and
      * none of new values exists in the entry.
      * 
      * Covers case 13.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1851,16 +1851,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=joe+cn=test
+     * new Rdn : cn=joe+cn=test
      *
      * @throws LdapException on error
      */
     @Test
     public void test131ReverseRenameCompositeCompositeOverlappingDeleteOldRdnDontExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=joe+cn=test" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=joe+cn=test" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big", "small" );
@@ -1882,8 +1882,8 @@ public class LdifRevertorTest
 
 
     /**
-     * Test a reversed rename ModifyDN, where the initial RDN is composite, 
-     * the new RDN is composite, they are overlapping, with deleteOldRdn = true, and
+     * Test a reversed rename ModifyDN, where the initial Rdn is composite,
+     * the new Rdn is composite, they are overlapping, with deleteOldRdn = true, and
      * some of the new values exists in the entry.
      * 
      * Covers case 13.1 of http://cwiki.apache.org/confluence/display/DIRxSRVx11/Reverse+LDIF
@@ -1897,16 +1897,16 @@ public class LdifRevertorTest
      * cn: big
      * sn: This is a test 
      * 
-     * new RDN : cn=big+cn=test
+     * new Rdn : cn=big+cn=test
      *
      * @throws LdapException on error
      */
     @Test
     public void test132ReverseRenameCompositeCompositeOverlappingDeleteOldRdnExistInEntry() throws LdapException
     {
-        DN dn = new DN( "cn=small+cn=test,ou=system" );
-        RDN oldRdn = new RDN( "cn=small+cn=test" );
-        RDN newRdn = new RDN( "cn=big+cn=test" );
+        Dn dn = new Dn( "cn=small+cn=test,ou=system" );
+        Rdn oldRdn = new Rdn( "cn=small+cn=test" );
+        Rdn newRdn = new Rdn( "cn=big+cn=test" );
 
         Entry entry = new DefaultEntry( dn );
         entry.put( "cn", "test", "big", "small" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java Sun Jan 23 01:17:06 2011
@@ -41,8 +41,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -374,7 +374,7 @@ public class LdifUtilsTest
         attributes.put( "cn", "Saarbrucken" );
         attributes.put( "sn", "test" );
 
-        String ldif = LdifUtils.convertToLdif( attributes, (DN)null, 15 );
+        String ldif = LdifUtils.convertToLdif( attributes, (Dn)null, 15 );
         Attributes result = LdifUtils.convertAttributesFromLdif( ldif );
         assertEquals( attributes, result );
     }
@@ -390,8 +390,8 @@ public class LdifUtilsTest
     @Test
     public void testReverseModifyDNSuperior() throws LdapException
     {
-        DN dn = new DN( "cn=john doe, dc=example, dc=com" );
-        DN newSuperior = new DN( "ou=system" );
+        Dn dn = new Dn( "cn=john doe, dc=example, dc=com" );
+        Dn newSuperior = new Dn( "ou=system" );
 
         Entry entry = new DefaultEntry( dn );
         entry.add( "objectClass", "person", "uidObject" );
@@ -399,7 +399,7 @@ public class LdifUtilsTest
         entry.add( "sn", "doe" );
         entry.add( "uid", "jdoe" );
 
-        List<LdifEntry> reverseds = LdifRevertor.reverseMoveAndRename( entry, newSuperior, new RDN( "cn=jack doe" ), false );
+        List<LdifEntry> reverseds = LdifRevertor.reverseMoveAndRename( entry, newSuperior, new Rdn( "cn=jack doe" ), false );
 
         assertNotNull( reverseds );
         assertEquals( 1, reverseds.size() );
@@ -422,8 +422,8 @@ public class LdifUtilsTest
     @Test
     public void testReverseModifyDNDeleteOldRdnSuperior() throws LdapException
     {
-        DN dn = new DN( "cn=john doe, dc=example, dc=com" );
-        DN newSuperior = new DN( "ou=system" );
+        Dn dn = new Dn( "cn=john doe, dc=example, dc=com" );
+        Dn newSuperior = new Dn( "ou=system" );
 
         Entry entry = new DefaultEntry( dn );
         entry.add( "objectClass", "person", "uidObject" );
@@ -431,7 +431,7 @@ public class LdifUtilsTest
         entry.add( "sn", "doe" );
         entry.add( "uid", "jdoe" );
 
-        List<LdifEntry> reverseds = LdifRevertor.reverseMoveAndRename( entry, newSuperior, new RDN( "cn=jack doe" ), false );
+        List<LdifEntry> reverseds = LdifRevertor.reverseMoveAndRename( entry, newSuperior, new Rdn( "cn=jack doe" ), false );
 
         assertNotNull( reverseds );
         assertEquals( 1, reverseds.size() );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java Sun Jan 23 01:17:06 2011
@@ -28,7 +28,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -77,8 +77,8 @@ public class AbstractResultResponseTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -116,8 +116,8 @@ public class AbstractResultResponseTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=apache,dc=org" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=apache,dc=org" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java Sun Jan 23 01:17:06 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -112,11 +112,11 @@ public class AddRequestImplTest
     public void testEqualsExactCopy() throws LdapException
     {
         AddRequestImpl req0 = new AddRequestImpl( 5 );
-        req0.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setEntryDn( new Dn( "cn=admin,dc=example,dc=com" ) );
         req0.setEntry( getEntry() );
 
         AddRequestImpl req1 = new AddRequestImpl( 5 );
-        req1.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setEntryDn( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setEntry( getEntry() );
 
         assertTrue( req0.equals( req1 ) );
@@ -130,11 +130,11 @@ public class AddRequestImplTest
     public void testNotEqualDiffId() throws LdapException
     {
         AddRequestImpl req0 = new AddRequestImpl( 7 );
-        req0.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setEntryDn( new Dn( "cn=admin,dc=example,dc=com" ) );
         req0.setEntry( getEntry() );
 
         AddRequestImpl req1 = new AddRequestImpl( 5 );
-        req1.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setEntryDn( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setEntry( getEntry() );
 
         assertFalse( req0.equals( req1 ) );
@@ -142,42 +142,42 @@ public class AddRequestImplTest
 
 
     /**
-     * Test for inequality when only the DN names are different.
+     * Test for inequality when only the Dn names are different.
      */
     @Test
     public void testNotEqualDiffName() throws LdapException
     {
         AddRequestImpl req0 = new AddRequestImpl( 5 );
         req0.setEntry( getEntry() );
-        req0.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setEntryDn( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         AddRequestImpl req1 = new AddRequestImpl( 5 );
         req1.setEntry( getEntry() );
-        req1.setEntryDn( new DN( "cn=admin,dc=apache,dc=org" ) );
+        req1.setEntryDn( new Dn( "cn=admin,dc=apache,dc=org" ) );
 
         assertFalse( req0.equals( req1 ) );
     }
 
 
     /**
-     * Test for inequality when only the DN names are different.
+     * Test for inequality when only the Dn names are different.
      */
     @Test
     public void testNotEqualDiffAttributes() throws LdapException
     {
         AddRequestImpl req0 = new AddRequestImpl( 5 );
         Entry entry0 = getEntry();
-        entry0.setDn( new DN( "cn=admin,dc=apache,dc=org" ) );
+        entry0.setDn( new Dn( "cn=admin,dc=apache,dc=org" ) );
         req0.setEntry( entry0 );
 
         AddRequestImpl req1 = new AddRequestImpl( 5 );
-        req1.setEntryDn( new DN( "cn=admin,dc=apache,dc=org" ) );
+        req1.setEntryDn( new Dn( "cn=admin,dc=apache,dc=org" ) );
 
         assertTrue( req0.equals( req1 ) );
         assertTrue( req1.equals( req0 ) );
 
         Entry entry1 = getEntry();
-        entry1.setDn( new DN( "cn=admin,dc=apache,dc=org" ) );
+        entry1.setDn( new Dn( "cn=admin,dc=apache,dc=org" ) );
         req1.setEntry( entry1 );
 
         assertTrue( req0.equals( req1 ) );
@@ -209,13 +209,13 @@ public class AddRequestImplTest
             }
 
 
-            public DN getEntryDn()
+            public Dn getEntryDn()
             {
                 return null;
             }
 
 
-            public void setEntryDn( DN entryDn )
+            public void setEntryDn( Dn entryDn )
             {
             }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -68,13 +68,13 @@ public class BindRequestImplTest
     {
         BindRequestImpl req0 = new BindRequestImpl( 5 );
         req0.setCredentials( "password".getBytes() );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req0.setSimple( true );
         req0.setVersion3( true );
 
         BindRequestImpl req1 = new BindRequestImpl( 5 );
         req1.setCredentials( "password".getBytes() );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setSimple( true );
         req1.setVersion3( true );
 
@@ -90,13 +90,13 @@ public class BindRequestImplTest
     {
         BindRequestImpl req0 = new BindRequestImpl( 7 );
         req0.setCredentials( "password".getBytes() );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req0.setSimple( true );
         req0.setVersion3( true );
 
         BindRequestImpl req1 = new BindRequestImpl( 5 );
         req1.setCredentials( "password".getBytes() );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setSimple( true );
         req1.setVersion3( true );
 
@@ -112,13 +112,13 @@ public class BindRequestImplTest
     {
         BindRequestImpl req0 = new BindRequestImpl( 5 );
         req0.setCredentials( "abcdefg".getBytes() );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req0.setSimple( true );
         req0.setVersion3( true );
 
         BindRequestImpl req1 = new BindRequestImpl( 5 );
         req1.setCredentials( "password".getBytes() );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setSimple( true );
         req1.setVersion3( true );
 
@@ -127,20 +127,20 @@ public class BindRequestImplTest
 
 
     /**
-     * Test for inequality when only the DN names are different.
+     * Test for inequality when only the Dn names are different.
      */
     @Test
     public void testNotEqualDiffName() throws LdapException
     {
         BindRequestImpl req0 = new BindRequestImpl( 5 );
         req0.setCredentials( "password".getBytes() );
-        req0.setName( new DN( "uid=akarasulu,dc=example,dc=com" ) );
+        req0.setName( new Dn( "uid=akarasulu,dc=example,dc=com" ) );
         req0.setSimple( true );
         req0.setVersion3( true );
 
         BindRequestImpl req1 = new BindRequestImpl( 5 );
         req1.setCredentials( "password".getBytes() );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setSimple( true );
         req1.setVersion3( true );
 
@@ -156,13 +156,13 @@ public class BindRequestImplTest
     {
         BindRequestImpl req0 = new BindRequestImpl( 5 );
         req0.setCredentials( "password".getBytes() );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req0.setSimple( false );
         req0.setVersion3( true );
 
         BindRequestImpl req1 = new BindRequestImpl( 5 );
         req1.setCredentials( "password".getBytes() );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setSimple( true );
         req1.setVersion3( true );
 
@@ -178,13 +178,13 @@ public class BindRequestImplTest
     {
         BindRequestImpl req0 = new BindRequestImpl( 5 );
         req0.setCredentials( "password".getBytes() );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req0.setSimple( true );
         req0.setVersion3( false );
 
         BindRequestImpl req1 = new BindRequestImpl( 5 );
         req1.setCredentials( "password".getBytes() );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setSimple( true );
         req1.setVersion3( true );
 
@@ -233,13 +233,13 @@ public class BindRequestImplTest
             }
 
 
-            public DN getName()
+            public Dn getName()
             {
                 return null;
             }
 
 
-            public void setName( DN name )
+            public void setName( Dn name )
             {
             }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java Sun Jan 23 01:17:06 2011
@@ -23,10 +23,7 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.BindResponseImpl;
-import org.apache.directory.shared.ldap.message.LdapResultImpl;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -134,8 +131,8 @@ public class BindResponseImplTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -171,8 +168,8 @@ public class BindResponseImplTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java Sun Jan 23 01:17:06 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -67,12 +67,12 @@ public class CompareRequestImplTest
     public void testEqualsExactCopy() throws LdapException
     {
         CompareRequestImpl req0 = new CompareRequestImpl( 5 );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req0.setAttributeId( "objectClass" );
         req0.setAssertionValue( "top" );
 
         CompareRequestImpl req1 = new CompareRequestImpl( 5 );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setAttributeId( "objectClass" );
         req1.setAssertionValue( "top" );
 
@@ -99,12 +99,12 @@ public class CompareRequestImplTest
     public void testHashCodeExactCopy() throws LdapException
     {
         CompareRequestImpl req0 = new CompareRequestImpl( 5 );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req0.setAttributeId( "objectClass" );
         req0.setAssertionValue( "top" );
 
         CompareRequestImpl req1 = new CompareRequestImpl( 5 );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
         req1.setAttributeId( "objectClass" );
         req1.setAssertionValue( "top" );
 
@@ -119,10 +119,10 @@ public class CompareRequestImplTest
     public void testNotEqualDiffId() throws LdapException
     {
         CompareRequestImpl req0 = new CompareRequestImpl( 7 );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         CompareRequestImpl req1 = new CompareRequestImpl( 5 );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         assertFalse( req0.equals( req1 ) );
         assertFalse( req1.equals( req0 ) );
@@ -136,12 +136,12 @@ public class CompareRequestImplTest
     public void testNotEqualDiffAttributeIds() throws LdapException
     {
         CompareRequestImpl req0 = new CompareRequestImpl( 5 );
-        req0.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
+        req0.setName( new Dn( "cn=admin,dc=apache,dc=org" ) );
         req0.setAttributeId( "dc" );
         req0.setAssertionValue( "apache.org" );
 
         CompareRequestImpl req1 = new CompareRequestImpl( 5 );
-        req1.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
+        req1.setName( new Dn( "cn=admin,dc=apache,dc=org" ) );
         req1.setAttributeId( "nisDomain" );
         req1.setAssertionValue( "apache.org" );
 
@@ -157,12 +157,12 @@ public class CompareRequestImplTest
     public void testNotEqualDiffValue() throws LdapException
     {
         CompareRequestImpl req0 = new CompareRequestImpl( 5 );
-        req0.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
+        req0.setName( new Dn( "cn=admin,dc=apache,dc=org" ) );
         req0.setAttributeId( "dc" );
         req0.setAssertionValue( "apache.org" );
 
         CompareRequestImpl req1 = new CompareRequestImpl( 5 );
-        req1.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
+        req1.setName( new Dn( "cn=admin,dc=apache,dc=org" ) );
         req1.setAttributeId( "dc" );
         req1.setAssertionValue( "nagoya.apache.org" );
 
@@ -210,13 +210,13 @@ public class CompareRequestImplTest
             }
 
 
-            public DN getName()
+            public Dn getName()
             {
                 return null;
             }
 
 
-            public void setName( DN name )
+            public void setName( Dn name )
             {
             }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -66,10 +66,10 @@ public class DeleteRequestImplTest
     public void testEqualsExactCopy() throws LdapException
     {
         DeleteRequestImpl req0 = new DeleteRequestImpl( 5 );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         DeleteRequestImpl req1 = new DeleteRequestImpl( 5 );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         assertTrue( req0.equals( req1 ) );
     }
@@ -93,10 +93,10 @@ public class DeleteRequestImplTest
     public void testHashCodeExactCopy() throws LdapException
     {
         DeleteRequestImpl req0 = new DeleteRequestImpl( 5 );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         DeleteRequestImpl req1 = new DeleteRequestImpl( 5 );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         assertTrue( req0.hashCode() == req1.hashCode() );
     }
@@ -109,26 +109,26 @@ public class DeleteRequestImplTest
     public void testNotEqualDiffId() throws LdapException
     {
         DeleteRequestImpl req0 = new DeleteRequestImpl( 7 );
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         DeleteRequestImpl req1 = new DeleteRequestImpl( 5 );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         assertFalse( req0.equals( req1 ) );
     }
 
 
     /**
-     * Test for inequality when only the DN names are different.
+     * Test for inequality when only the Dn names are different.
      */
     @Test
     public void testNotEqualDiffName() throws LdapException
     {
         DeleteRequestImpl req0 = new DeleteRequestImpl( 5 );
-        req0.setName( new DN( "uid=akarasulu,dc=example,dc=com" ) );
+        req0.setName( new Dn( "uid=akarasulu,dc=example,dc=com" ) );
 
         DeleteRequestImpl req1 = new DeleteRequestImpl( 5 );
-        req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req1.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         assertFalse( req0.equals( req1 ) );
     }
@@ -143,13 +143,13 @@ public class DeleteRequestImplTest
     {
         DeleteRequest req0 = new DeleteRequest()
         {
-            public DN getName()
+            public Dn getName()
             {
                 return null;
             }
 
 
-            public void setName( DN name )
+            public void setName( Dn name )
             {
             }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -63,7 +63,7 @@ public class ExtendedResponseImplTest
 
         try
         {
-            result.setMatchedDn( new DN( "dc=example,dc=com" ) );
+            result.setMatchedDn( new Dn( "dc=example,dc=com" ) );
         }
         catch ( LdapException ine )
         {
@@ -156,7 +156,7 @@ public class ExtendedResponseImplTest
 
                 try
                 {
-                    result.setMatchedDn( new DN( "dc=example,dc=com" ) );
+                    result.setMatchedDn( new Dn( "dc=example,dc=com" ) );
                 }
                 catch ( LdapException ine )
                 {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTru
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -102,13 +102,13 @@ public class LdapResultImplTest
             }
 
 
-            public DN getMatchedDn()
+            public Dn getMatchedDn()
             {
                 return null;
             }
 
 
-            public void setMatchedDn( DN dn )
+            public void setMatchedDn( Dn dn )
             {
             }
 
@@ -158,8 +158,8 @@ public class LdapResultImplTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -227,8 +227,8 @@ public class LdapResultImplTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -257,8 +257,8 @@ public class LdapResultImplTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -288,8 +288,8 @@ public class LdapResultImplTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=apache,dc=org" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=apache,dc=org" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -319,8 +319,8 @@ public class LdapResultImplTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.SIZE_LIMIT_EXCEEDED );
@@ -350,8 +350,8 @@ public class LdapResultImplTest
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new Dn( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new Dn( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java Sun Jan 23 01:17:06 2011
@@ -31,8 +31,8 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -62,9 +62,9 @@ public class ModifyDnRequestImplTest
 
         try
         {
-            request.setName( new DN( "dc=admins,dc=apache,dc=org" ) );
-            request.setNewRdn( new RDN( "dc=administrators" ) );
-            request.setNewSuperior( new DN( "dc=groups,dc=apache,dc=org" ) );
+            request.setName( new Dn( "dc=admins,dc=apache,dc=org" ) );
+            request.setNewRdn( new Rdn( "dc=administrators" ) );
+            request.setNewSuperior( new Dn( "dc=groups,dc=apache,dc=org" ) );
         }
         catch ( LdapException ine )
         {
@@ -167,16 +167,16 @@ public class ModifyDnRequestImplTest
 
 
     /**
-     * Test for inequality when only the DN names are different.
+     * Test for inequality when only the Dn names are different.
      */
     @Test
     public void testNotEqualDiffName() throws LdapException
     {
         ModifyDnRequestImpl req0 = getRequest();
-        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         ModifyDnRequestImpl req1 = getRequest();
-        req1.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
+        req1.setName( new Dn( "cn=admin,dc=apache,dc=org" ) );
 
         assertFalse( req0.equals( req1 ) );
     }
@@ -189,10 +189,10 @@ public class ModifyDnRequestImplTest
     public void testNotEqualDiffNewSuperior() throws LdapException
     {
         ModifyDnRequestImpl req0 = getRequest();
-        req0.setNewSuperior( new DN( "cn=admin,dc=example,dc=com" ) );
+        req0.setNewSuperior( new Dn( "cn=admin,dc=example,dc=com" ) );
 
         ModifyDnRequestImpl req1 = getRequest();
-        req1.setNewSuperior( new DN( "cn=admin,dc=apache,dc=org" ) );
+        req1.setNewSuperior( new Dn( "cn=admin,dc=apache,dc=org" ) );
 
         assertFalse( req0.equals( req1 ) );
     }
@@ -221,10 +221,10 @@ public class ModifyDnRequestImplTest
     public void testNotEqualDiffNewRdn() throws LdapException
     {
         ModifyDnRequestImpl req0 = getRequest();
-        req0.setNewRdn( new RDN( "cn=admin0" ) );
+        req0.setNewRdn( new Rdn( "cn=admin0" ) );
 
         ModifyDnRequestImpl req1 = getRequest();
-        req1.setNewRdn( new RDN( "cn=admin1" ) );
+        req1.setNewRdn( new Rdn( "cn=admin1" ) );
 
         assertFalse( req0.equals( req1 ) );
         assertFalse( req1.equals( req0 ) );
@@ -239,11 +239,11 @@ public class ModifyDnRequestImplTest
     {
         ModifyDnRequest req0 = new ModifyDnRequest()
         {
-            public DN getName()
+            public Dn getName()
             {
                 try
                 {
-                    return new DN( "dc=admins,dc=apache,dc=org" );
+                    return new Dn( "dc=admins,dc=apache,dc=org" );
                 }
                 catch ( LdapException ine )
                 {
@@ -253,16 +253,16 @@ public class ModifyDnRequestImplTest
             }
 
 
-            public void setName( DN name )
+            public void setName( Dn name )
             {
             }
 
 
-            public RDN getNewRdn()
+            public Rdn getNewRdn()
             {
                 try
                 {
-                    return new RDN( "dc=administrators" );
+                    return new Rdn( "dc=administrators" );
                 }
                 catch ( LdapException ine )
                 {
@@ -272,7 +272,7 @@ public class ModifyDnRequestImplTest
             }
 
 
-            public void setNewRdn( RDN newRdn )
+            public void setNewRdn( Rdn newRdn )
             {
             }
 
@@ -288,11 +288,11 @@ public class ModifyDnRequestImplTest
             }
 
 
-            public DN getNewSuperior()
+            public Dn getNewSuperior()
             {
                 try
                 {
-                    return new DN( "dc=groups,dc=apache,dc=org" );
+                    return new Dn( "dc=groups,dc=apache,dc=org" );
                 }
                 catch ( LdapException ine )
                 {
@@ -302,7 +302,7 @@ public class ModifyDnRequestImplTest
             }
 
 
-            public void setNewSuperior( DN newSuperior )
+            public void setNewSuperior( Dn newSuperior )
             {
             }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java Sun Jan 23 01:17:06 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -68,7 +68,7 @@ public class ModifyRequestImplTest
 
         try
         {
-            req.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
+            req.setName( new Dn( "cn=admin,dc=apache,dc=org" ) );
         }
         catch ( LdapException ne )
         {
@@ -156,7 +156,7 @@ public class ModifyRequestImplTest
 
 
     /**
-     * Test for inequality when only the DN names are different.
+     * Test for inequality when only the Dn names are different.
      */
     @Test
     public void testNotEqualDiffName()
@@ -164,9 +164,9 @@ public class ModifyRequestImplTest
         try
         {
             ModifyRequestImpl req0 = getRequest();
-            req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
+            req0.setName( new Dn( "cn=admin,dc=example,dc=com" ) );
             ModifyRequestImpl req1 = getRequest();
-            req1.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
+            req1.setName( new Dn( "cn=admin,dc=apache,dc=org" ) );
 
             assertFalse( req0.equals( req1 ) );
         }
@@ -323,11 +323,11 @@ public class ModifyRequestImplTest
             }
 
 
-            public DN getName()
+            public Dn getName()
             {
                 try
                 {
-                    return new DN( "cn=admin,dc=apache,dc=org" );
+                    return new Dn( "cn=admin,dc=apache,dc=org" );
                 }
                 catch ( Exception e )
                 {
@@ -337,7 +337,7 @@ public class ModifyRequestImplTest
             }
 
 
-            public void setName( DN name )
+            public void setName( Dn name )
             {
             }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -62,7 +62,7 @@ public class SearchResponseDoneImplTest
 
         try
         {
-            result.setMatchedDn( new DN( "dc=example,dc=com" ) );
+            result.setMatchedDn( new Dn( "dc=example,dc=com" ) );
         }
         catch ( LdapException ine )
         {
@@ -118,7 +118,7 @@ public class SearchResponseDoneImplTest
 
                 try
                 {
-                    result.setMatchedDn( new DN( "dc=example,dc=com" ) );
+                    result.setMatchedDn( new Dn( "dc=example,dc=com" ) );
                 }
                 catch ( Exception e )
                 {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -95,11 +95,11 @@ public class SearchResponseEntryImplTest
     {
         SearchResultEntryImpl resp0 = new SearchResultEntryImpl( 5 );
         resp0.setEntry( getEntry() );
-        resp0.setObjectName( new DN( "dc=example,dc=com" ) );
+        resp0.setObjectName( new Dn( "dc=example,dc=com" ) );
 
         SearchResultEntryImpl resp1 = new SearchResultEntryImpl( 5 );
         resp1.setEntry( getEntry() );
-        resp1.setObjectName( new DN( "dc=example,dc=com" ) );
+        resp1.setObjectName( new Dn( "dc=example,dc=com" ) );
 
         assertTrue( "exact copies should be equal", resp0.equals( resp1 ) );
         assertTrue( "exact copies should be equal", resp1.equals( resp0 ) );
@@ -125,11 +125,11 @@ public class SearchResponseEntryImplTest
     {
         SearchResultEntryImpl resp0 = new SearchResultEntryImpl( 5 );
         resp0.setEntry( getEntry() );
-        resp0.setObjectName( new DN( "dc=example,dc=com" ) );
+        resp0.setObjectName( new Dn( "dc=example,dc=com" ) );
 
         SearchResultEntryImpl resp1 = new SearchResultEntryImpl( 5 );
         resp1.setEntry( getEntry() );
-        resp1.setObjectName( new DN( "dc=example,dc=com" ) );
+        resp1.setObjectName( new Dn( "dc=example,dc=com" ) );
 
         assertTrue( resp0.hashCode() == resp1.hashCode() );
     }
@@ -143,11 +143,11 @@ public class SearchResponseEntryImplTest
     {
         SearchResultEntryImpl resp0 = new SearchResultEntryImpl( 5 );
         resp0.setEntry( getEntry() );
-        resp0.setObjectName( new DN( "dc=apache,dc=org" ) );
+        resp0.setObjectName( new Dn( "dc=apache,dc=org" ) );
 
         SearchResultEntryImpl resp1 = new SearchResultEntryImpl( 5 );
         resp1.setEntry( getEntry() );
-        resp1.setObjectName( new DN( "dc=example,dc=com" ) );
+        resp1.setObjectName( new Dn( "dc=example,dc=com" ) );
 
         assertFalse( "different object names should not be equal", resp1.equals( resp0 ) );
         assertFalse( "different object names should not be equal", resp0.equals( resp1 ) );



Mime
View raw message