directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [27/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
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnUtilsTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnUtilsTest.java Sun Jan 23 01:17:06 2011
@@ -198,13 +198,13 @@ public class DnUtilsTest
     public void testGetRelativeName() throws LdapInvalidDnException
     {
         // test the basis case first with the root
-        DN ancestor = new DN( "" );
-        DN descendant = new DN( "ou=system" );
-        DN relativeName = DnUtils.getRelativeName(ancestor, descendant);
+        Dn ancestor = new Dn( "" );
+        Dn descendant = new Dn( "ou=system" );
+        Dn relativeName = DnUtils.getRelativeName(ancestor, descendant);
         assertEquals( relativeName.toString(), "ou=system" );
 
-        ancestor = new DN( "ou=system" );
-        descendant = new DN( "ou=users,ou=system" );
+        ancestor = new Dn( "ou=system" );
+        descendant = new Dn( "ou=users,ou=system" );
         relativeName = DnUtils.getRelativeName(ancestor, descendant);
         assertEquals( relativeName.toString(), "ou=users" );
     }

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java Sun Jan 23 01:17:06 2011
@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
 import static org.junit.Assert.assertNotNull;
 
 /**
- * Tests the fast DN parser.
+ * Tests the fast Dn parser.
  * 
  * The test cases are copied from DnParserTest and adjusted when an
  * TooComplexException is expected.
@@ -46,13 +46,13 @@ public class FastDnParserTest
 {
 
     /**
-     * test an empty DN
+     * test an empty Dn
      */
     @Test
     public void testLdapDNEmpty() throws LdapException
     {
         FastDnParser dnParser = FastDnParser.getNameParser();
-        assertEquals( "", ( ( DN ) dnParser.parse( "" ) ).getName() );
+        assertEquals( "", ( (Dn) dnParser.parse( "" ) ).getName() );
     }
 
 
@@ -65,7 +65,7 @@ public class FastDnParserTest
     {
         FastDnParser dnParser = FastDnParser.getNameParser();
 
-        // empty DN is ok
+        // empty Dn is ok
         dnParser.parse( " " );
 
         // test DNs starting with an descr
@@ -154,13 +154,13 @@ public class FastDnParserTest
 
 
     /**
-     * test a simple DN : a = b
+     * test a simple Dn : a = b
      */
     @Test
     public void testLdapDNSimple() throws LdapException
     {
         FastDnParser dnParser = FastDnParser.getNameParser();
-        DN dn = ( DN ) dnParser.parse( "a = b" );
+        Dn dn = (Dn) dnParser.parse( "a = b" );
 
         assertEquals( "a = b", dn.getName() );
         assertEquals( "a=b", dn.getNormName() );
@@ -180,47 +180,47 @@ public class FastDnParserTest
 
 
     /**
-     * test a composite DN : a = b, d = e
+     * test a composite Dn : a = b, d = e
      */
     @Test
     public void testLdapDNComposite() throws LdapException
     {
         FastDnParser dnParser = FastDnParser.getNameParser();
-        DN dn = ( DN ) dnParser.parse( "a = b, c = d" );
+        Dn dn = (Dn) dnParser.parse( "a = b, c = d" );
         assertEquals( "a=b,c=d", dn.getNormName() );
         assertEquals( "a = b, c = d", dn.getName() );
     }
 
 
     /**
-     * test a composite DN with or without spaces: a=b, a =b, a= b, a = b, a = b
+     * test a composite Dn with or without spaces: a=b, a =b, a= b, a = b, a = b
      */
     @Test
     public void testLdapDNCompositeWithSpace() throws LdapException
     {
         FastDnParser dnParser = FastDnParser.getNameParser();
-        DN dn = ( DN ) dnParser.parse( "a=b, a =b, a= b, a = b, a  =  b" );
+        Dn dn = (Dn) dnParser.parse( "a=b, a =b, a= b, a = b, a  =  b" );
         assertEquals( "a=b,a=b,a=b,a=b,a=b", dn.getNormName() );
         assertEquals( "a=b, a =b, a= b, a = b, a  =  b", dn.getName() );
     }
 
 
     /**
-     * test a composite DN with differents separators : a=b;c=d,e=f It should
+     * test a composite Dn with differents separators : a=b;c=d,e=f It should
      * return a=b,c=d,e=f (the ';' is replaced by a ',')
      */
     @Test
     public void testLdapDNCompositeSepators() throws LdapException
     {
         FastDnParser dnParser = FastDnParser.getNameParser();
-        DN dn = ( DN ) dnParser.parse( "a=b;c=d,e=f" );
+        Dn dn = (Dn) dnParser.parse( "a=b;c=d,e=f" );
         assertEquals( "a=b,c=d,e=f", dn.getNormName() );
         assertEquals( "a=b;c=d,e=f", dn.getName() );
     }
 
 
     /**
-     * test a simple DN with multiple NameComponents : a = b + c = d
+     * test a simple Dn with multiple NameComponents : a = b + c = d
      */
     @Test
     public void testLdapDNSimpleMultivaluedAttribute() throws LdapException
@@ -229,7 +229,7 @@ public class FastDnParserTest
         try
         {
             dnParser.parse( "a = b + c = d" );
-            fail( "Multivalued RDN not supported by fast parser" );
+            fail( "Multivalued Rdn not supported by fast parser" );
         }
         catch ( TooComplexException tce )
         {
@@ -239,7 +239,7 @@ public class FastDnParserTest
 
 
     /**
-     * test a composite DN with multiple NC and separators : a=b+c=d, e=f + g=h +
+     * test a composite Dn with multiple NC and separators : a=b+c=d, e=f + g=h +
      * i=j
      */
     @Test
@@ -249,7 +249,7 @@ public class FastDnParserTest
         try
         {
             dnParser.parse( "a=b+c=d, e=f + g=h + i=j" );
-            fail( "Multivalued RDN not supported by fast parser" );
+            fail( "Multivalued Rdn not supported by fast parser" );
         }
         catch ( TooComplexException tce )
         {
@@ -259,7 +259,7 @@ public class FastDnParserTest
 
 
     /**
-     * test a simple DN with an oid prefix (uppercase) : OID.12.34.56 = azerty
+     * test a simple Dn with an oid prefix (uppercase) : OID.12.34.56 = azerty
      */
     @Test
     public void testLdapDNOidUpper() throws LdapException
@@ -278,7 +278,7 @@ public class FastDnParserTest
 
 
     /**
-     * test a simple DN with an oid prefix (lowercase) : oid.12.34.56 = azerty
+     * test a simple Dn with an oid prefix (lowercase) : oid.12.34.56 = azerty
      */
     @Test
     public void testLdapDNOidLower() throws LdapException
@@ -297,35 +297,35 @@ public class FastDnParserTest
 
 
     /**
-     * test a simple DN with an oid attribut without oid prefix : 12.34.56 =
+     * test a simple Dn with an oid attribut without oid prefix : 12.34.56 =
      * azerty
      */
     @Test
     public void testLdapDNOidWithoutPrefix() throws LdapException
     {
         FastDnParser dnParser = FastDnParser.getNameParser();
-        DN dn = ( DN ) dnParser.parse( "12.34.56 = azerty" );
+        Dn dn = (Dn) dnParser.parse( "12.34.56 = azerty" );
         assertEquals( "12.34.56=azerty", dn.getNormName() );
         assertEquals( "12.34.56 = azerty", dn.getName() );
     }
 
 
     /**
-     * test a composite DN with an oid attribut wiithout oid prefix : 12.34.56 =
+     * test a composite Dn with an oid attribut wiithout oid prefix : 12.34.56 =
      * azerty; 7.8 = test
      */
     @Test
     public void testLdapDNCompositeOidWithoutPrefix() throws LdapException
     {
         FastDnParser dnParser = FastDnParser.getNameParser();
-        DN dn = ( DN ) dnParser.parse( "12.34.56 = azerty; 7.8 = test" );
+        Dn dn = (Dn) dnParser.parse( "12.34.56 = azerty; 7.8 = test" );
         assertEquals( "12.34.56=azerty,7.8=test", dn.getNormName() );
         assertEquals( "12.34.56 = azerty; 7.8 = test", dn.getName() );
     }
 
 
     /**
-     * test a simple DN with pair char attribute value : a = \,\=\+\<\>\#\;\\\"\C3\A9"
+     * test a simple Dn with pair char attribute value : a = \,\=\+\<\>\#\;\\\"\C3\A9"
      */
     @Test
     public void testLdapDNPairCharAttributeValue() throws LdapException
@@ -344,7 +344,7 @@ public class FastDnParserTest
 
 
     /**
-     * test a simple DN with hexString attribute value : a = #0010A0AAFF
+     * test a simple Dn with hexString attribute value : a = #0010A0AAFF
      */
     @Test
     public void testLdapDNHexStringAttributeValue() throws LdapException
@@ -382,7 +382,7 @@ public class FastDnParserTest
 
 
     /**
-     * test a simple DN with quoted attribute value : a = "quoted \"value"
+     * test a simple Dn with quoted attribute value : a = "quoted \"value"
      */
     @Test
     public void testLdapDNQuotedAttributeValue() throws LdapException
@@ -407,9 +407,9 @@ public class FastDnParserTest
     public void testNameToBytes() throws LdapException
     {
         FastDnParser dnParser = FastDnParser.getNameParser();
-        DN dn = ( DN ) dnParser.parse( "cn = John, ou = People, OU = Marketing" );
+        Dn dn = (Dn) dnParser.parse( "cn = John, ou = People, OU = Marketing" );
 
-        byte[] bytes = DN.getBytes( dn );
+        byte[] bytes = Dn.getBytes(dn);
 
         assertEquals( 30, bytes.length );
         assertEquals( "cn=John,ou=People,ou=Marketing", Strings.utf8ToString(bytes) );
@@ -424,7 +424,7 @@ public class FastDnParserTest
                         (byte) 0xa9, 'c', 'h', 'a', 'r', 'n', 'y'});
 
         FastDnParser dnParser = FastDnParser.getNameParser();
-        DN name = ( DN ) dnParser.parse( dn );
+        Dn name = (Dn) dnParser.parse( dn );
 
         assertEquals( dn, name.getName() );
         assertEquals( "cn=Emmanuel  L\u00e9charny", name.getNormName() );
@@ -438,7 +438,7 @@ public class FastDnParserTest
                 {'C', '=', ' ', 'E', (byte) 0xc3, (byte) 0xa9, 'c'});
 
         FastDnParser dnParser = FastDnParser.getNameParser();
-        DN name = ( DN ) dnParser.parse( dn );
+        Dn name = (Dn) dnParser.parse( dn );
 
         assertEquals( dn, name.getName() );
         assertEquals( "c=E\u00e9c", name.getNormName() );
@@ -488,7 +488,7 @@ public class FastDnParserTest
     {
         FastDnParser parser = FastDnParser.getNameParser();
 
-        DN nameEmpty = parser.parse( "" );
+        Dn nameEmpty = parser.parse( "" );
 
         assertNotNull( nameEmpty );
     }
@@ -505,9 +505,9 @@ public class FastDnParserTest
     {
         FastDnParser parser = FastDnParser.getNameParser();
 
-        DN nameNull = parser.parse( null );
+        Dn nameNull = parser.parse( null );
 
-        assertEquals( "Null DN are legal : ", "", nameNull.toString() );
+        assertEquals( "Null Dn are legal : ", "", nameNull.toString() );
     }
 
 
@@ -522,14 +522,14 @@ public class FastDnParserTest
     {
         FastDnParser parser = FastDnParser.getNameParser();
 
-        DN nameRFC1779_1 = parser
+        Dn nameRFC1779_1 = parser
             .parse( "CN=Marshall T. Rose, O=Dover Beach Consulting, L=Santa Clara, ST=California, C=US" );
 
         assertEquals( "RFC1779_1 : ",
             "CN=Marshall T. Rose, O=Dover Beach Consulting, L=Santa Clara, ST=California, C=US",
-            ( ( DN ) nameRFC1779_1 ).getName() );
+            ( (Dn) nameRFC1779_1 ).getName() );
         assertEquals( "RFC1779_1 : ", "cn=Marshall T. Rose,o=Dover Beach Consulting,l=Santa Clara,st=California,c=US",
-            ((DN)nameRFC1779_1).getNormName() );
+            ((Dn)nameRFC1779_1).getNormName() );
     }
 
 
@@ -544,9 +544,9 @@ public class FastDnParserTest
     {
         FastDnParser parser = FastDnParser.getNameParser();
 
-        DN nameRFC2253_1 = parser.parse( "CN=Steve Kille,O=Isode limited,C=GB" );
+        Dn nameRFC2253_1 = parser.parse( "CN=Steve Kille,O=Isode limited,C=GB" );
 
-        assertEquals( "RFC2253_1 : ", "CN=Steve Kille,O=Isode limited,C=GB", ( ( DN ) nameRFC2253_1 ).getName() );
+        assertEquals( "RFC2253_1 : ", "CN=Steve Kille,O=Isode limited,C=GB", ( (Dn) nameRFC2253_1 ).getName() );
     }
 
 
@@ -564,7 +564,7 @@ public class FastDnParserTest
         try
         {
             parser.parse( "CN = Sales + CN =   J. Smith , O = Widget Inc. , C = US" );
-            fail( "Multivalued RDN not supported by fast parser" );
+            fail( "Multivalued Rdn not supported by fast parser" );
         }
         catch ( TooComplexException tce )
         {
@@ -817,7 +817,7 @@ public class FastDnParserTest
 
 
     /**
-     * Test to check that even with a non escaped char, the DN is parsed ok
+     * Test to check that even with a non escaped char, the Dn is parsed ok
      * or at least an error is generated.
      *
      * @throws LdapException

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java Sun Jan 23 01:17:06 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -53,12 +52,12 @@ public class MultiThreadedTest
 
     private static Map<String, OidNormalizer> oidsMap;
 
-    private static DN referenceDn;
-    private static DN sharedDn;
-    private static RDN referenceRdn;
-    private static RDN sharedRdn;
-    private static AVA referenceAva;
-    private static AVA sharedAva;
+    private static Dn referenceDn;
+    private static Dn sharedDn;
+    private static Rdn referenceRdn;
+    private static Rdn sharedRdn;
+    private static Ava referenceAva;
+    private static Ava sharedAva;
 
 
     @BeforeClass
@@ -75,19 +74,19 @@ public class MultiThreadedTest
         oidsMap.put( "organizationalUnitName", new OidNormalizer( "2.5.4.11", new DeepTrimToLowerNormalizer() ) );
         oidsMap.put( "2.5.4.11", new OidNormalizer( "2.5.4.11", new DeepTrimToLowerNormalizer() ) );
 
-        referenceDn = new DN( "dc=example,dc=com" );
+        referenceDn = new Dn( "dc=example,dc=com" );
         referenceDn.normalize( oidsMap );
-        sharedDn = new DN( "dc=example,dc=com" );
+        sharedDn = new Dn( "dc=example,dc=com" );
         sharedDn.normalize( oidsMap );
 
-        referenceRdn = new RDN( "ou=system" );
+        referenceRdn = new Rdn( "ou=system" );
         referenceRdn.normalize( oidsMap );
-        sharedRdn = new RDN( "ou=system" );
+        sharedRdn = new Rdn( "ou=system" );
         sharedRdn.normalize( oidsMap );
 
-        referenceAva = new AVA( "ou", "2.5.4.11", "System", "system" );
+        referenceAva = new Ava( "ou", "2.5.4.11", "System", "system" );
         referenceAva.normalize();
-        sharedAva = new AVA( "ou", "2.5.4.11", "System", "system" );
+        sharedAva = new Ava( "ou", "2.5.4.11", "System", "system" );
         sharedAva.normalize();
     }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java Sun Jan 23 01:17:06 2011
@@ -53,53 +53,53 @@ public class RdnTest
     // ~ Methods
     // ------------------------------------------------------------------------------------
     /**
-     * Test a null RDN
+     * Test a null Rdn
      */
     @Test
     public void testRdnNull()
     {
-        assertEquals( "", new RDN().toString() );
+        assertEquals( "", new Rdn().toString() );
     }
 
 
     /**
-     * test an empty RDN
+     * test an empty Rdn
      * 
      * @throws LdapException
      */
     @Test
     public void testRdnEmpty() throws LdapException
     {
-        assertEquals( "", new RDN( "" ).toString() );
+        assertEquals( "", new Rdn( "" ).toString() );
     }
 
 
     /**
-     * test a simple RDN : a = b
+     * test a simple Rdn : a = b
      * 
      * @throws LdapException
      */
     @Test
     public void testRdnSimple() throws LdapException
     {
-        assertEquals( "a=b", new RDN( "a = b" ).getNormName() );
+        assertEquals( "a=b", new Rdn( "a = b" ).getNormName() );
     }
 
 
     /**
-     * test a composite RDN : a = b, d = e
+     * test a composite Rdn : a = b, d = e
      * 
      * @throws LdapException
      */
     @Test
     public void testRdnComposite() throws LdapException
     {
-        assertEquals( "a=b+c=d", new RDN( "a = b + c = d" ).getNormName() );
+        assertEquals( "a=b+c=d", new Rdn( "a = b + c = d" ).getNormName() );
     }
 
 
     /**
-     * test a composite RDN with or without spaces: a=b, a =b, a= b, a = b, a =
+     * test a composite Rdn with or without spaces: a=b, a =b, a= b, a = b, a =
      * b
      * 
      * @throws LdapException
@@ -107,40 +107,40 @@ public class RdnTest
     @Test
     public void testRdnCompositeWithSpace() throws LdapException
     {
-        assertEquals( "a=b", new RDN( "a=b" ).getNormName() );
-        assertEquals( "a=b", new RDN( " a=b" ).getNormName() );
-        assertEquals( "a=b", new RDN( "a =b" ).getNormName() );
-        assertEquals( "a=b", new RDN( "a= b" ).getNormName() );
-        assertEquals( "a=b", new RDN( "a=b " ).getNormName() );
-        assertEquals( "a=b", new RDN( " a =b" ).getNormName() );
-        assertEquals( "a=b", new RDN( " a= b" ).getNormName() );
-        assertEquals( "a=b", new RDN( " a=b " ).getNormName() );
-        assertEquals( "a=b", new RDN( "a = b" ).getNormName() );
-        assertEquals( "a=b", new RDN( "a =b " ).getNormName() );
-        assertEquals( "a=b", new RDN( "a= b " ).getNormName() );
-        assertEquals( "a=b", new RDN( " a = b" ).getNormName() );
-        assertEquals( "a=b", new RDN( " a =b " ).getNormName() );
-        assertEquals( "a=b", new RDN( " a= b " ).getNormName() );
-        assertEquals( "a=b", new RDN( "a = b " ).getNormName() );
-        assertEquals( "a=b", new RDN( " a = b " ).getNormName() );
+        assertEquals( "a=b", new Rdn( "a=b" ).getNormName() );
+        assertEquals( "a=b", new Rdn( " a=b" ).getNormName() );
+        assertEquals( "a=b", new Rdn( "a =b" ).getNormName() );
+        assertEquals( "a=b", new Rdn( "a= b" ).getNormName() );
+        assertEquals( "a=b", new Rdn( "a=b " ).getNormName() );
+        assertEquals( "a=b", new Rdn( " a =b" ).getNormName() );
+        assertEquals( "a=b", new Rdn( " a= b" ).getNormName() );
+        assertEquals( "a=b", new Rdn( " a=b " ).getNormName() );
+        assertEquals( "a=b", new Rdn( "a = b" ).getNormName() );
+        assertEquals( "a=b", new Rdn( "a =b " ).getNormName() );
+        assertEquals( "a=b", new Rdn( "a= b " ).getNormName() );
+        assertEquals( "a=b", new Rdn( " a = b" ).getNormName() );
+        assertEquals( "a=b", new Rdn( " a =b " ).getNormName() );
+        assertEquals( "a=b", new Rdn( " a= b " ).getNormName() );
+        assertEquals( "a=b", new Rdn( "a = b " ).getNormName() );
+        assertEquals( "a=b", new Rdn( " a = b " ).getNormName() );
     }
 
 
     /**
-     * test a simple RDN with differents separators : a = b + c = d
+     * test a simple Rdn with differents separators : a = b + c = d
      * 
      * @throws LdapException
      */
     @Test
     public void testRdnSimpleMultivaluedAttribute() throws LdapException
     {
-        String result = new RDN( "a = b + c = d" ).getNormName();
+        String result = new Rdn( "a = b + c = d" ).getNormName();
         assertEquals( "a=b+c=d", result );
     }
 
 
     /**
-     * test a composite RDN with differents separators : a=b+c=d, e=f + g=h +
+     * test a composite Rdn with differents separators : a=b+c=d, e=f + g=h +
      * i=j
      * 
      * @throws LdapException
@@ -148,7 +148,7 @@ public class RdnTest
     @Test
     public void testRdnCompositeMultivaluedAttribute() throws LdapException
     {
-        RDN rdn = new RDN( "a =b+c=d + e=f + g  =h + i =j " );
+        Rdn rdn = new Rdn( "a =b+c=d + e=f + g  =h + i =j " );
 
         // NameComponent are not ordered
         assertEquals( "b", rdn.getValue( "a" ) );
@@ -160,31 +160,31 @@ public class RdnTest
 
 
     /**
-     * test a simple RDN with an oid prefix (uppercase) : OID.12.34.56 = azerty
+     * test a simple Rdn with an oid prefix (uppercase) : OID.12.34.56 = azerty
      * 
      * @throws LdapException
      */
     @Test
     public void testRdnOidUpper() throws LdapException
     {
-        assertEquals( "oid.12.34.56=azerty", new RDN( "OID.12.34.56 =  azerty" ).getNormName() );
+        assertEquals( "oid.12.34.56=azerty", new Rdn( "OID.12.34.56 =  azerty" ).getNormName() );
     }
 
 
     /**
-     * test a simple RDN with an oid prefix (lowercase) : oid.12.34.56 = azerty
+     * test a simple Rdn with an oid prefix (lowercase) : oid.12.34.56 = azerty
      * 
      * @throws LdapException
      */
     @Test
     public void testRdnOidLower() throws LdapException
     {
-        assertEquals( "oid.12.34.56=azerty", new RDN( "oid.12.34.56 = azerty" ).getNormName() );
+        assertEquals( "oid.12.34.56=azerty", new Rdn( "oid.12.34.56 = azerty" ).getNormName() );
     }
 
 
     /**
-     * test a simple RDN with an oid attribut wiithout oid prefix : 12.34.56 =
+     * test a simple Rdn with an oid attribut wiithout oid prefix : 12.34.56 =
      * azerty
      * 
      * @throws LdapException
@@ -192,12 +192,12 @@ public class RdnTest
     @Test
     public void testRdnOidWithoutPrefix() throws LdapException
     {
-        assertEquals( "12.34.56=azerty", new RDN( "12.34.56 = azerty" ).getNormName() );
+        assertEquals( "12.34.56=azerty", new Rdn( "12.34.56 = azerty" ).getNormName() );
     }
 
 
     /**
-     * test a composite RDN with an oid attribut wiithout oid prefix : 12.34.56 =
+     * test a composite Rdn with an oid attribut wiithout oid prefix : 12.34.56 =
      * azerty; 7.8 = test
      * 
      * @throws LdapException
@@ -205,13 +205,13 @@ public class RdnTest
     @Test
     public void testRdnCompositeOidWithoutPrefix() throws LdapException
     {
-        String result = new RDN( "12.34.56 = azerty + 7.8 = test" ).getNormName();
+        String result = new Rdn( "12.34.56 = azerty + 7.8 = test" ).getNormName();
         assertEquals( "12.34.56=azerty+7.8=test", result );
     }
 
 
     /**
-     * test a simple RDN with pair char attribute value : a = \,\=\+\<\>\#\;\\\"\C3\A9"
+     * test a simple Rdn with pair char attribute value : a = \,\=\+\<\>\#\;\\\"\C3\A9"
      * 
      * @throws LdapException
      */
@@ -221,17 +221,17 @@ public class RdnTest
         String rdn = Strings.utf8ToString(new byte[]
                 {'a', '=', '\\', ',', '=', '\\', '+', '\\', '<', '\\', '>', '#', '\\', ';', '\\', '\\', '\\', '"', '\\',
                         'C', '3', '\\', 'A', '9'});
-        assertEquals( "a=\\,=\\+\\<\\>#\\;\\\\\\\"\u00E9", new RDN( rdn ).getNormName() );
+        assertEquals( "a=\\,=\\+\\<\\>#\\;\\\\\\\"\u00E9", new Rdn( rdn ).getNormName() );
     }
 
 
     /**
-     * test a simple RDN with hexString attribute value : a = #0010A0AAFF
+     * test a simple Rdn with hexString attribute value : a = #0010A0AAFF
      */
     @Test
     public void testRdnHexStringAttributeValue() throws LdapException
     {
-        assertEquals( "a=#0010A0AAFF", new RDN( "a = #0010A0AAFF" ).getNormName() );
+        assertEquals( "a=#0010A0AAFF", new Rdn( "a = #0010A0AAFF" ).getNormName() );
     }
 
     /**
@@ -242,7 +242,7 @@ public class RdnTest
     {
         try
         {
-            new RDN( "a=#zz" );
+            new Rdn( "a=#zz" );
             fail();
         }
         catch ( LdapException ine )
@@ -252,24 +252,24 @@ public class RdnTest
     }
 
     /**
-     * test a simple RDN with quoted attribute value : a = "quoted \"value"
+     * test a simple Rdn with quoted attribute value : a = "quoted \"value"
      * 
      * @throws LdapException
      */
     @Test
     public void testRdnQuotedAttributeValue() throws LdapException
     {
-        assertEquals( "a=quoted \\\"value", new RDN( "a = quoted \\\"value" ).getNormName() );
+        assertEquals( "a=quoted \\\"value", new Rdn( "a = quoted \\\"value" ).getNormName() );
     }
 
 
     /**
-     * Test the clone method for a RDN.
+     * Test the clone method for a Rdn.
      */
     @Test
     public void testParseRDNNull()
     {
-        RDN rdn = null;
+        Rdn rdn = null;
 
         try
         {
@@ -284,16 +284,16 @@ public class RdnTest
 
 
     /**
-     * Test the clone method for a RDN.
+     * Test the clone method for a Rdn.
      * 
      * @throws LdapException
      */
     @Test
     public void testRDNCloningOneNameComponent() throws LdapException
     {
-        RDN rdn = new RDN( "a", "a", "b", "b" );
+        Rdn rdn = new Rdn( "a", "a", "b", "b" );
 
-        RDN rdnClone = ( RDN ) rdn.clone();
+        Rdn rdnClone = (Rdn) rdn.clone();
 
         RdnParser.parse( "c=d", rdn );
 
@@ -302,30 +302,30 @@ public class RdnTest
 
 
     /**
-     * Test teh creation of a new RDN
+     * Test teh creation of a new Rdn
      * 
      * @throws LdapException
      */
     @Test
     public void testRDNCreation() throws LdapException
     {
-        RDN rdn = new RDN( "A", "  b  " );
+        Rdn rdn = new Rdn( "A", "  b  " );
         assertEquals( "a=\\  b \\ ", rdn.getNormName() );
         assertEquals( "A=  b  ", rdn.getName() );
     }
 
 
     /**
-     * Test the clone method for a RDN.
+     * Test the clone method for a Rdn.
      * 
      * @throws LdapException
      */
     @Test
     public void testRDNCloningTwoNameComponent() throws LdapException
     {
-        RDN rdn = new RDN( "a = b + aa = bb" );
+        Rdn rdn = new Rdn( "a = b + aa = bb" );
 
-        RDN rdnClone = ( RDN ) rdn.clone();
+        Rdn rdnClone = (Rdn) rdn.clone();
 
         rdn.clear();
         RdnParser.parse( "c=d", rdn );
@@ -337,15 +337,15 @@ public class RdnTest
 
 
     /**
-     * Test the compareTo method for a RDN.
+     * Test the compareTo method for a Rdn.
      * 
      * @throws LdapException
      */
     @Test
     public void testRDNCompareToNull() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b + c = d + a = f + g = h " );
-        RDN rdn2 = null;
+        Rdn rdn1 = new Rdn( " a = b + c = d + a = f + g = h " );
+        Rdn rdn2 = null;
         assertTrue( rdn1.compareTo( rdn2 ) > 0 );
     }
 
@@ -358,8 +358,8 @@ public class RdnTest
     @Test
     public void testRDNCompareToNCS2NC() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b + c = d + a = f + g = h " );
-        RDN rdn2 = new RDN( " a = b " );
+        Rdn rdn1 = new Rdn( " a = b + c = d + a = f + g = h " );
+        Rdn rdn2 = new Rdn( " a = b " );
         assertTrue( rdn1.compareTo( rdn2 ) > 0 );
     }
 
@@ -372,8 +372,8 @@ public class RdnTest
     @Test
     public void testRDNCompareToNC2NCS() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b " );
-        RDN rdn2 = new RDN( " a = b + c = d + a = f + g = h " );
+        Rdn rdn1 = new Rdn( " a = b " );
+        Rdn rdn2 = new Rdn( " a = b + c = d + a = f + g = h " );
 
         assertTrue( rdn1.compareTo( rdn2 ) < 0 );
     }
@@ -387,8 +387,8 @@ public class RdnTest
     @Test
     public void testRDNCompareToNCS2NCSOrdered() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b + c = d + a = f + g = h " );
-        RDN rdn2 = new RDN( " a = b + c = d + a = f + g = h " );
+        Rdn rdn1 = new Rdn( " a = b + c = d + a = f + g = h " );
+        Rdn rdn2 = new Rdn( " a = b + c = d + a = f + g = h " );
 
         assertEquals( 0, rdn1.compareTo( rdn2 ) );
     }
@@ -402,8 +402,8 @@ public class RdnTest
     @Test
     public void testRDNCompareToNCS2NCSUnordered() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b + a = f + g = h + c = d " );
-        RDN rdn2 = new RDN( " a = b + c = d + a = f + g = h " );
+        Rdn rdn1 = new Rdn( " a = b + a = f + g = h + c = d " );
+        Rdn rdn2 = new Rdn( " a = b + c = d + a = f + g = h " );
 
         assertEquals( 0, rdn1.compareTo( rdn2 ) );
     }
@@ -417,8 +417,8 @@ public class RdnTest
     @Test
     public void testRDNCompareToNCS2NCSNotEquals() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = f + g = h + c = d " );
-        RDN rdn2 = new RDN( " c = d + a = h + g = h " );
+        Rdn rdn1 = new Rdn( " a = f + g = h + c = d " );
+        Rdn rdn2 = new Rdn( " c = d + a = h + g = h " );
 
         assertTrue( rdn1.compareTo( rdn2 ) < 0 );
         assertTrue( rdn2.compareTo( rdn1 ) > 0 );
@@ -436,22 +436,22 @@ public class RdnTest
     public void testCompareSecondAtav() throws LdapException
     {
         // the second ATAV differs
-        RDN rdn1 = new RDN( " a = b + c = d " );
-        RDN rdn2 = new RDN( " a = b + c = y " );
+        Rdn rdn1 = new Rdn( " a = b + c = d " );
+        Rdn rdn2 = new Rdn( " a = b + c = y " );
         assertTrue( rdn1.compareTo( rdn2 ) < 0 );
         assertTrue( rdn2.compareTo( rdn1 ) > 0 );
         assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
 
         // the third ATAV differs
-        RDN rdn3 = new RDN( " a = b + c = d + e = f " );
-        RDN rdn4 = new RDN( " a = b + c = d + e = y " );
+        Rdn rdn3 = new Rdn( " a = b + c = d + e = f " );
+        Rdn rdn4 = new Rdn( " a = b + c = d + e = y " );
         assertTrue( rdn3.compareTo( rdn4 ) < 0 );
         assertTrue( rdn4.compareTo( rdn3 ) > 0 );
         assertEquals( 0, rdn3.compareTo( rdn4 ) + rdn4.compareTo( rdn3 ) );
 
         // the second ATAV differs in value only
-        RDN rdn5 = new RDN( " a = b + a = c " );
-        RDN rdn6 = new RDN( " a = b + a = y " );
+        Rdn rdn5 = new Rdn( " a = b + a = c " );
+        Rdn rdn6 = new Rdn( " a = b + a = y " );
         assertTrue( rdn5.compareTo( rdn6 ) < 0 );
         assertTrue( rdn6.compareTo( rdn5 ) > 0 );
         assertEquals( 0, rdn5.compareTo( rdn6 ) + rdn6.compareTo( rdn5 ) );
@@ -468,18 +468,18 @@ public class RdnTest
     @Test
     public void testCompareIndependentFromOrder() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b + c = d " );
-        RDN rdn2 = new RDN( " c = d + a = b " );
+        Rdn rdn1 = new Rdn( " a = b + c = d " );
+        Rdn rdn2 = new Rdn( " c = d + a = b " );
         assertEquals( 0, rdn1.compareTo( rdn2 ) );
 
-        rdn1 = new RDN( " a = b + c = e " );
-        rdn2 = new RDN( " c = d + a = b " );
+        rdn1 = new Rdn( " a = b + c = e " );
+        rdn2 = new Rdn( " c = d + a = b " );
         assertTrue( rdn1.compareTo( rdn2 ) > 0 );
         assertTrue( rdn2.compareTo( rdn1 ) < 0 );
         assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
 
-        rdn1 = new RDN( " a = b + c = d " );
-        rdn2 = new RDN( " e = f + g = h " );
+        rdn1 = new Rdn( " a = b + c = d " );
+        rdn2 = new Rdn( " e = f + g = h " );
         assertTrue( rdn1.compareTo( rdn2 ) < 0 );
         assertTrue( rdn2.compareTo( rdn1 ) > 0 );
         assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -495,8 +495,8 @@ public class RdnTest
     @Test
     public void testCompareInvertableNC2NC() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b " );
-        RDN rdn2 = new RDN( " a = c " );
+        Rdn rdn1 = new Rdn( " a = b " );
+        Rdn rdn2 = new Rdn( " a = c " );
         assertTrue( rdn1.compareTo( rdn2 ) < 0 );
         assertTrue( rdn2.compareTo( rdn1 ) > 0 );
         assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -513,8 +513,8 @@ public class RdnTest
     @Test
     public void testCompareInvertableNCS2NCSDifferentValues() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b + a = c " );
-        RDN rdn2 = new RDN( " a = b + a = y " );
+        Rdn rdn1 = new Rdn( " a = b + a = c " );
+        Rdn rdn2 = new Rdn( " a = b + a = y " );
         assertTrue( rdn1.compareTo( rdn2 ) < 0 );
         assertTrue( rdn2.compareTo( rdn1 ) > 0 );
         assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -530,8 +530,8 @@ public class RdnTest
     @Test
     public void testCompareInvertableNCS2NCSDifferentTypes() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b + c = d  " );
-        RDN rdn2 = new RDN( " e = f + g = h " );
+        Rdn rdn1 = new Rdn( " a = b + c = d  " );
+        Rdn rdn2 = new Rdn( " e = f + g = h " );
         assertTrue( rdn1.compareTo( rdn2 ) < 0 );
         assertTrue( rdn2.compareTo( rdn1 ) > 0 );
         assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -547,8 +547,8 @@ public class RdnTest
     @Test
     public void testCompareInvertableNCS2NCSUnordered() throws LdapException
     {
-        RDN rdn1 = new RDN( " c = d + a = b " );
-        RDN rdn2 = new RDN( " a = b + e = f " );
+        Rdn rdn1 = new Rdn( " c = d + a = b " );
+        Rdn rdn2 = new Rdn( " a = b + e = f " );
         assertTrue( rdn1.compareTo( rdn2 ) < 0 );
         assertTrue( rdn2.compareTo( rdn1 ) > 0 );
         assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -556,14 +556,14 @@ public class RdnTest
 
 
     /**
-     * Compares with a null RDN.
+     * Compares with a null Rdn.
      * 
      * @throws LdapException
      */
     @Test
     public void testRDNCompareToNullRdn() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b " );
+        Rdn rdn1 = new Rdn( " a = b " );
 
         assertEquals( 1, rdn1.compareTo( null ) );
     }
@@ -577,8 +577,8 @@ public class RdnTest
     @Test
     public void testRDNCompareToNC2NC() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b " );
-        RDN rdn2 = new RDN( " a = b " );
+        Rdn rdn1 = new Rdn( " a = b " );
+        Rdn rdn2 = new Rdn( " a = b " );
 
         assertEquals( 0, rdn1.compareTo( rdn2 ) );
     }
@@ -592,8 +592,8 @@ public class RdnTest
     @Test
     public void testRDNCompareToNC2NCUperCase() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b " );
-        RDN rdn2 = new RDN( " A = b " );
+        Rdn rdn1 = new Rdn( " a = b " );
+        Rdn rdn2 = new Rdn( " A = b " );
 
         assertEquals( 0, rdn1.compareTo( rdn2 ) );
         assertEquals( true, rdn1.equals( rdn2 ) );
@@ -608,8 +608,8 @@ public class RdnTest
     @Test
     public void testRDNCompareToNC2NCNotEquals() throws LdapException
     {
-        RDN rdn1 = new RDN( " a = b " );
-        RDN rdn2 = new RDN( " A = d " );
+        Rdn rdn1 = new Rdn( " a = b " );
+        Rdn rdn2 = new Rdn( " A = d " );
 
         assertTrue( rdn1.compareTo( rdn2 ) < 0 );
     }
@@ -624,7 +624,7 @@ public class RdnTest
     @Test
     public void testGetValue() throws LdapException
     {
-        RDN rdn = new RDN( " a = b + a = f + g = h + c = d " );
+        Rdn rdn = new Rdn( " a = b + a = f + g = h + c = d " );
 
         assertEquals( "b", rdn.getNormValue().getString() );
     }
@@ -639,7 +639,7 @@ public class RdnTest
     @Test
     public void testGetType() throws LdapException
     {
-        RDN rdn = new RDN( " a = b + a = f + g = h + c = d " );
+        Rdn rdn = new Rdn( " a = b + a = f + g = h + c = d " );
 
         assertEquals( "a", rdn.getNormType() );
     }
@@ -653,7 +653,7 @@ public class RdnTest
     @Test
     public void testGetSize() throws LdapException
     {
-        RDN rdn = new RDN( " a = b + a = f + g = h + c = d " );
+        Rdn rdn = new Rdn( " a = b + a = f + g = h + c = d " );
 
         assertEquals( 4, rdn.size() );
     }
@@ -666,7 +666,7 @@ public class RdnTest
     @Test
     public void testGetSize0()
     {
-        RDN rdn = new RDN();
+        Rdn rdn = new Rdn();
 
         assertEquals( 0, rdn.size() );
     }
@@ -680,26 +680,26 @@ public class RdnTest
     @Test
     public void testEquals() throws LdapException
     {
-        RDN rdn = new RDN( "a=b + c=d + a=f" );
+        Rdn rdn = new Rdn( "a=b + c=d + a=f" );
 
         assertFalse( rdn.equals( null ) );
         assertFalse( rdn.equals( "test" ) );
-        assertFalse( rdn.equals( new RDN( "a=c + c=d + a=f" ) ) );
-        assertFalse( rdn.equals( new RDN( "a=b" ) ) );
-        assertTrue( rdn.equals( new RDN( "a=b + c=d + a=f" ) ) );
-        assertTrue( rdn.equals( new RDN( "a=b + C=d + A=f" ) ) );
-        assertTrue( rdn.equals( new RDN( "c=d + a=f + a=b" ) ) );
+        assertFalse( rdn.equals( new Rdn( "a=c + c=d + a=f" ) ) );
+        assertFalse( rdn.equals( new Rdn( "a=b" ) ) );
+        assertTrue( rdn.equals( new Rdn( "a=b + c=d + a=f" ) ) );
+        assertTrue( rdn.equals( new Rdn( "a=b + C=d + A=f" ) ) );
+        assertTrue( rdn.equals( new Rdn( "c=d + a=f + a=b" ) ) );
     }
 
 
     @Test
     public void testUnescapeValueHexa()
     {
-        byte[] res = ( byte[] ) RDN.unescapeValue( "#fF" );
+        byte[] res = ( byte[] ) Rdn.unescapeValue("#fF");
 
         assertEquals( "0xFF ", Strings.dumpBytes(res) );
 
-        res = ( byte[] ) RDN.unescapeValue( "#0123456789aBCDEF" );
+        res = ( byte[] ) Rdn.unescapeValue("#0123456789aBCDEF");
         assertEquals( "0x01 0x23 0x45 0x67 0x89 0xAB 0xCD 0xEF ", Strings.dumpBytes(res) );
     }
 
@@ -709,7 +709,7 @@ public class RdnTest
     {
         try
         {
-            RDN.unescapeValue( "#fF1" );
+            Rdn.unescapeValue("#fF1");
             fail(); // Should not happen
         }
         catch ( IllegalArgumentException iae )
@@ -722,7 +722,7 @@ public class RdnTest
     @Test
     public void testUnescapeValueString()
     {
-        String res = ( String ) RDN.unescapeValue( "azerty" );
+        String res = ( String ) Rdn.unescapeValue("azerty");
 
         assertEquals( "azerty", res );
     }
@@ -731,7 +731,7 @@ public class RdnTest
     @Test
     public void testUnescapeValueStringSpecial()
     {
-        String res = ( String ) RDN.unescapeValue( "\\\\\\#\\,\\+\\;\\<\\>\\=\\\"\\ " );
+        String res = ( String ) Rdn.unescapeValue("\\\\\\#\\,\\+\\;\\<\\>\\=\\\"\\ ");
 
         assertEquals( "\\#,+;<>=\" ", res );
     }
@@ -740,7 +740,7 @@ public class RdnTest
     @Test
     public void testUnescapeValueStringWithSpaceInTheMiddle()
     {
-        String res = ( String ) RDN.unescapeValue( "a b" );
+        String res = ( String ) Rdn.unescapeValue("a b");
 
         assertEquals( "a b", res );
     }
@@ -749,7 +749,7 @@ public class RdnTest
     @Test
     public void testUnescapeValueStringWithSpaceInAtTheBeginning()
     {
-        String res = ( String ) RDN.unescapeValue( "\\ a b" );
+        String res = ( String ) Rdn.unescapeValue("\\ a b");
 
         assertEquals( " a b", res );
     }
@@ -758,7 +758,7 @@ public class RdnTest
     @Test
     public void testUnescapeValueStringWithSpaceInAtTheEnd()
     {
-        String res = ( String ) RDN.unescapeValue( "a b\\ " );
+        String res = ( String ) Rdn.unescapeValue("a b\\ ");
 
         assertEquals( "a b ", res );
     }
@@ -767,7 +767,7 @@ public class RdnTest
     @Test
     public void testUnescapeValueStringWithPoundInTheMiddle()
     {
-        String res = ( String ) RDN.unescapeValue( "a#b" );
+        String res = ( String ) Rdn.unescapeValue("a#b");
 
         assertEquals( "a#b", res );
     }
@@ -776,7 +776,7 @@ public class RdnTest
     @Test
     public void testUnescapeValueStringWithPoundAtTheEnd()
     {
-        String res = ( String ) RDN.unescapeValue( "ab#" );
+        String res = ( String ) Rdn.unescapeValue("ab#");
 
         assertEquals( "ab#", res );
     }
@@ -785,7 +785,7 @@ public class RdnTest
     @Test
     public void testEscapeValueString()
     {
-        String res = RDN.escapeValue( Strings.getBytesUtf8("azerty") );
+        String res = Rdn.escapeValue(Strings.getBytesUtf8("azerty"));
 
         assertEquals( "azerty", res );
     }
@@ -794,7 +794,7 @@ public class RdnTest
     @Test
     public void testEscapeValueStringSpecial()
     {
-        String res = RDN.escapeValue( Strings.getBytesUtf8("\\#,+;<>=\" ") );
+        String res = Rdn.escapeValue(Strings.getBytesUtf8("\\#,+;<>=\" "));
 
         assertEquals( "\\\\#\\,\\+\\;\\<\\>\\=\\\"\\ ", res );
     }
@@ -803,8 +803,8 @@ public class RdnTest
     @Test
     public void testEscapeValueNumeric()
     {
-        String res = RDN.escapeValue( new byte[]
-            { '-', 0x00, '-', 0x1F, '-', 0x7F, '-' } );
+        String res = Rdn.escapeValue(new byte[]
+                {'-', 0x00, '-', 0x1F, '-', 0x7F, '-'});
 
         assertEquals( "-\\00-\\1F-\\7F-", res );
     }
@@ -813,8 +813,8 @@ public class RdnTest
     @Test
     public void testEscapeValueMix()
     {
-        String res = RDN.escapeValue( new byte[]
-            { '\\', 0x00, '-', '+', '#', 0x7F, '-' } );
+        String res = Rdn.escapeValue(new byte[]
+                {'\\', 0x00, '-', '+', '#', 0x7F, '-'});
 
         assertEquals( "\\\\\\00-\\+#\\7F-", res );
     }
@@ -823,7 +823,7 @@ public class RdnTest
     @Test
     public void testDIRSERVER_703() throws LdapException
     {
-        RDN rdn = new RDN( "cn=Kate Bush+sn=Bush" );
+        Rdn rdn = new Rdn( "cn=Kate Bush+sn=Bush" );
         assertEquals( "cn=Kate Bush+sn=Bush", rdn.getName() );
     }
 
@@ -831,8 +831,8 @@ public class RdnTest
     @Test
     public void testMultiValuedIterator() throws LdapException
     {
-        RDN rdn = new RDN( "cn=Kate Bush+sn=Bush" );
-        Iterator<AVA> iterator = rdn.iterator();
+        Rdn rdn = new Rdn( "cn=Kate Bush+sn=Bush" );
+        Iterator<Ava> iterator = rdn.iterator();
         assertNotNull( iterator );
         assertTrue( iterator.hasNext() );
         assertNotNull( iterator.next() );
@@ -845,8 +845,8 @@ public class RdnTest
     @Test
     public void testSingleValuedIterator() throws LdapException
     {
-        RDN rdn = new RDN( "cn=Kate Bush" );
-        Iterator<AVA> iterator = rdn.iterator();
+        Rdn rdn = new Rdn( "cn=Kate Bush" );
+        Iterator<Ava> iterator = rdn.iterator();
         assertNotNull( iterator );
         assertTrue( iterator.hasNext() );
         assertNotNull( iterator.next() );
@@ -857,8 +857,8 @@ public class RdnTest
     @Test
     public void testEmptyIterator()
     {
-        RDN rdn = new RDN();
-        Iterator<AVA> iterator = rdn.iterator();
+        Rdn rdn = new Rdn();
+        Iterator<Ava> iterator = rdn.iterator();
         assertNotNull( iterator );
         assertFalse( iterator.hasNext() );
     }
@@ -867,7 +867,7 @@ public class RdnTest
     @Test
     public void testRdnWithSpaces() throws LdapException
     {
-        RDN rdn = new RDN( "cn=a\\ b\\ c" );
+        Rdn rdn = new Rdn( "cn=a\\ b\\ c" );
         assertEquals( "cn=a b c", rdn.getNormName() );
     }
 
@@ -875,14 +875,14 @@ public class RdnTest
     @Test
     public void testEscapedSpaceInValue() throws LdapException
     {
-        RDN rdn1 = new RDN( "cn=a b c" );
-        RDN rdn2 = new RDN( "cn=a\\ b\\ c" );
+        Rdn rdn1 = new Rdn( "cn=a b c" );
+        Rdn rdn2 = new Rdn( "cn=a\\ b\\ c" );
         assertEquals( "cn=a b c", rdn1.getNormName() );
         assertEquals( "cn=a b c", rdn2.getNormName() );
         assertTrue( rdn1.equals( rdn2 ) );
 
-        RDN rdn3 = new RDN( "cn=\\ a b c\\ " );
-        RDN rdn4 = new RDN( "cn=\\ a\\ b\\ c\\ " );
+        Rdn rdn3 = new Rdn( "cn=\\ a b c\\ " );
+        Rdn rdn4 = new Rdn( "cn=\\ a\\ b\\ c\\ " );
         assertEquals( "cn=\\ a b c\\ ", rdn3.getNormName() );
         assertEquals( "cn=\\ a b c\\ ", rdn4.getNormName() );
         assertTrue( rdn3.equals( rdn4 ) );
@@ -892,14 +892,14 @@ public class RdnTest
     @Test
     public void testEscapedHashInValue() throws LdapException
     {
-        RDN rdn1 = new RDN( "cn=a#b#c" );
-        RDN rdn2 = new RDN( "cn=a\\#b\\#c" );
+        Rdn rdn1 = new Rdn( "cn=a#b#c" );
+        Rdn rdn2 = new Rdn( "cn=a\\#b\\#c" );
         assertEquals( "cn=a#b#c", rdn1.getNormName() );
         assertEquals( "cn=a#b#c", rdn2.getNormName() );
         assertTrue( rdn1.equals( rdn2 ) );
 
-        RDN rdn3 = new RDN( "cn=\\#a#b#c\\#" );
-        RDN rdn4 = new RDN( "cn=\\#a\\#b\\#c\\#" );
+        Rdn rdn3 = new Rdn( "cn=\\#a#b#c\\#" );
+        Rdn rdn4 = new Rdn( "cn=\\#a\\#b\\#c\\#" );
         assertEquals( "cn=\\#a#b#c#", rdn3.getNormName() );
         assertEquals( "cn=\\#a#b#c#", rdn4.getNormName() );
         assertTrue( rdn3.equals( rdn4 ) );
@@ -910,39 +910,39 @@ public class RdnTest
     public void testEscapedAttributeValue()
     {
         // space doesn't need to be escaped in the middle of a string
-        assertEquals( "a b", RDN.escapeValue( "a b" ) );
-        assertEquals( "a b c", RDN.escapeValue( "a b c" ) );
-        assertEquals( "a b c d", RDN.escapeValue( "a b c d" ) );
+        assertEquals( "a b", Rdn.escapeValue("a b") );
+        assertEquals( "a b c", Rdn.escapeValue("a b c") );
+        assertEquals( "a b c d", Rdn.escapeValue("a b c d") );
 
         // space must be escaped at the beginning and the end of a string
-        assertEquals( "\\ a b", RDN.escapeValue( " a b" ) );
-        assertEquals( "a b\\ ", RDN.escapeValue( "a b " ) );
-        assertEquals( "\\ a b\\ ", RDN.escapeValue( " a b " ) );
-        assertEquals( "\\  a  b \\ ", RDN.escapeValue( "  a  b  " ) );
+        assertEquals( "\\ a b", Rdn.escapeValue(" a b") );
+        assertEquals( "a b\\ ", Rdn.escapeValue("a b ") );
+        assertEquals( "\\ a b\\ ", Rdn.escapeValue(" a b ") );
+        assertEquals( "\\  a  b \\ ", Rdn.escapeValue("  a  b  ") );
 
         // hash doesn't need to be escaped in the middle and the end of a string
-        assertEquals( "a#b", RDN.escapeValue( "a#b" ) );
-        assertEquals( "a#b#", RDN.escapeValue( "a#b#" ) );
-        assertEquals( "a#b#c", RDN.escapeValue( "a#b#c" ) );
-        assertEquals( "a#b#c#", RDN.escapeValue( "a#b#c#" ) );
-        assertEquals( "a#b#c#d", RDN.escapeValue( "a#b#c#d" ) );
-        assertEquals( "a#b#c#d#", RDN.escapeValue( "a#b#c#d#" ) );
+        assertEquals( "a#b", Rdn.escapeValue("a#b") );
+        assertEquals( "a#b#", Rdn.escapeValue("a#b#") );
+        assertEquals( "a#b#c", Rdn.escapeValue("a#b#c") );
+        assertEquals( "a#b#c#", Rdn.escapeValue("a#b#c#") );
+        assertEquals( "a#b#c#d", Rdn.escapeValue("a#b#c#d") );
+        assertEquals( "a#b#c#d#", Rdn.escapeValue("a#b#c#d#") );
 
         // hash must be escaped at the beginning of a string
-        assertEquals( "\\#a#b", RDN.escapeValue( "#a#b" ) );
-        assertEquals( "\\##a#b", RDN.escapeValue( "##a#b" ) );
+        assertEquals( "\\#a#b", Rdn.escapeValue("#a#b") );
+        assertEquals( "\\##a#b", Rdn.escapeValue("##a#b") );
     }
 
 
     /** Serialization tests ------------------------------------------------- */
 
     /**
-     * Test serialization of an empty RDN
+     * Test serialization of an empty Rdn
      */
     @Test
     public void testEmptyRDNSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( "" );
+        Rdn rdn = new Rdn( "" );
 
         rdn.normalize();
 
@@ -956,7 +956,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = (RDN)in.readObject();
+        Rdn rdn2 = (Rdn)in.readObject();
 
         assertEquals( rdn, rdn2 );
     }
@@ -965,7 +965,7 @@ public class RdnTest
     @Test
     public void testNullRdnSerialization() throws IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN();
+        Rdn rdn = new Rdn();
 
         rdn.normalize();
 
@@ -979,7 +979,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = (RDN)in.readObject();
+        Rdn rdn2 = (Rdn)in.readObject();
 
         assertEquals( rdn, rdn2 );
     }
@@ -991,7 +991,7 @@ public class RdnTest
     @Test
     public void testSimpleRdnSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( "a=b" );
+        Rdn rdn = new Rdn( "a=b" );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1004,7 +1004,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = (RDN)in.readObject();
+        Rdn rdn2 = (Rdn)in.readObject();
 
         assertEquals( rdn, rdn2 );
     }
@@ -1016,7 +1016,7 @@ public class RdnTest
     @Test
     public void testSimpleRdn2Serialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( " ABC  = DEF " );
+        Rdn rdn = new Rdn( " ABC  = DEF " );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1029,7 +1029,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = (RDN)in.readObject();
+        Rdn rdn2 = (Rdn)in.readObject();
 
         assertEquals( rdn, rdn2 );
     }
@@ -1041,7 +1041,7 @@ public class RdnTest
     @Test
     public void testSimpleRdnNoValueSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( " ABC  =" );
+        Rdn rdn = new Rdn( " ABC  =" );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1054,7 +1054,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = (RDN)in.readObject();
+        Rdn rdn2 = (Rdn)in.readObject();
 
         assertEquals( rdn, rdn2 );
     }
@@ -1066,7 +1066,7 @@ public class RdnTest
     @Test
     public void testSimpleRdnOneValueSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( " ABC  = def " );
+        Rdn rdn = new Rdn( " ABC  = def " );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1079,7 +1079,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = (RDN)in.readObject();
+        Rdn rdn2 = (Rdn)in.readObject();
 
         assertEquals( rdn, rdn2 );
     }
@@ -1091,7 +1091,7 @@ public class RdnTest
     @Test
     public void testSimpleRdnThreeValuesSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( " A = a + B = b + C = c " );
+        Rdn rdn = new Rdn( " A = a + B = b + C = c " );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1104,7 +1104,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = (RDN)in.readObject();
+        Rdn rdn2 = (Rdn)in.readObject();
 
         assertEquals( rdn, rdn2 );
     }
@@ -1117,7 +1117,7 @@ public class RdnTest
     public void testSimpleRdnThreeValuesUnorderedSerialization() throws LdapException, IOException,
         ClassNotFoundException
     {
-        RDN rdn = new RDN( " B = b + A = a + C = c " );
+        Rdn rdn = new Rdn( " B = b + A = a + C = c " );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1130,7 +1130,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = (RDN)in.readObject();
+        Rdn rdn2 = (Rdn)in.readObject();
 
         assertEquals( rdn, rdn2 );
     }
@@ -1139,12 +1139,12 @@ public class RdnTest
     /** Static Serialization tests ------------------------------------------------- */
 
     /**
-     * Test serialization of an empty RDN
+     * Test serialization of an empty Rdn
      */
     @Test
     public void testEmptyRDNStaticSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( "" );
+        Rdn rdn = new Rdn( "" );
 
         rdn.normalize();
 
@@ -1159,7 +1159,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = RdnSerializer.deserialize( in );
+        Rdn rdn2 = RdnSerializer.deserialize( in );
 
         assertEquals( rdn, rdn2 );
     }
@@ -1168,7 +1168,7 @@ public class RdnTest
     @Test
     public void testNullRdnStaticSerialization() throws IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN();
+        Rdn rdn = new Rdn();
 
         rdn.normalize();
 
@@ -1183,7 +1183,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = RdnSerializer.deserialize( in );
+        Rdn rdn2 = RdnSerializer.deserialize( in );
 
         assertEquals( rdn, rdn2 );
     }
@@ -1195,7 +1195,7 @@ public class RdnTest
     @Test
     public void testSimpleRdnStaticSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( "a=b" );
+        Rdn rdn = new Rdn( "a=b" );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1209,7 +1209,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = RdnSerializer.deserialize( in );
+        Rdn rdn2 = RdnSerializer.deserialize( in );
 
         assertEquals( rdn, rdn2 );
     }
@@ -1221,7 +1221,7 @@ public class RdnTest
     @Test
     public void testSimpleRdn2StaticSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( " ABC  = DEF " );
+        Rdn rdn = new Rdn( " ABC  = DEF " );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1235,7 +1235,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = RdnSerializer.deserialize( in );
+        Rdn rdn2 = RdnSerializer.deserialize( in );
 
         assertEquals( rdn, rdn2 );
     }
@@ -1247,7 +1247,7 @@ public class RdnTest
     @Test
     public void testSimpleRdnNoValueStaticSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( " ABC  =" );
+        Rdn rdn = new Rdn( " ABC  =" );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1261,7 +1261,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = RdnSerializer.deserialize( in );
+        Rdn rdn2 = RdnSerializer.deserialize( in );
 
         assertEquals( rdn, rdn2 );
     }
@@ -1273,7 +1273,7 @@ public class RdnTest
     @Test
     public void testSimpleRdnOneValueStaticSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        RDN rdn = new RDN( " ABC  = def " );
+        Rdn rdn = new Rdn( " ABC  = def " );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1287,7 +1287,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = RdnSerializer.deserialize( in );
+        Rdn rdn2 = RdnSerializer.deserialize( in );
 
         assertEquals( rdn, rdn2 );
     }
@@ -1300,7 +1300,7 @@ public class RdnTest
     public void testSimpleRdnThreeValuesStaticSerialization() throws LdapException, IOException,
         ClassNotFoundException
     {
-        RDN rdn = new RDN( " A = a + B = b + C = c " );
+        Rdn rdn = new Rdn( " A = a + B = b + C = c " );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1314,7 +1314,7 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = RdnSerializer.deserialize( in );
+        Rdn rdn2 = RdnSerializer.deserialize( in );
 
         assertEquals( rdn, rdn2 );
     }
@@ -1327,7 +1327,7 @@ public class RdnTest
     public void testSimpleRdnThreeValuesUnorderedStaticSerialization() throws LdapException, IOException,
         ClassNotFoundException
     {
-        RDN rdn = new RDN( " B = b + A = a + C = c " );
+        Rdn rdn = new Rdn( " B = b + A = a + C = c " );
         rdn.normalize();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1341,40 +1341,40 @@ public class RdnTest
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        RDN rdn2 = RdnSerializer.deserialize( in );
+        Rdn rdn2 = RdnSerializer.deserialize( in );
 
         assertEquals( rdn, rdn2 );
     }
 
 
     /**
-     * test an RDN with empty value
+     * test an Rdn with empty value
      */
     @Test
     public void testRdnWithEmptyValue() throws LdapException
     {
         assertTrue( RdnParser.isValid( "a=" ) );
         assertTrue( RdnParser.isValid( "a=\"\"" ) );
-        assertEquals( "a=", new RDN( "a=\"\"" ).getNormName() );
-        assertEquals( "a=", new RDN( "a=" ).getNormName() );
+        assertEquals( "a=", new Rdn( "a=\"\"" ).getNormName() );
+        assertEquals( "a=", new Rdn( "a=" ).getNormName() );
     }
 
 
     /**
-     * test an RDN with escaped comma
+     * test an Rdn with escaped comma
      */
     @Test
     public void testRdnWithEscapedComa() throws LdapException
     {
         assertTrue( RdnParser.isValid( "a=b\\,c" ) );
-        assertEquals( "a=b\\,c", new RDN( "a=b\\,c" ).getNormName() );
+        assertEquals( "a=b\\,c", new Rdn( "a=b\\,c" ).getNormName() );
 
         assertTrue( RdnParser.isValid( "a=\"b,c\"" ) );
-        assertEquals( "a=b\\,c", new RDN( "a=\"b,c\"" ).getNormName() );
-        assertEquals( "a=\"b,c\"", new RDN( "a=\"b,c\"" ).getName() );
+        assertEquals( "a=b\\,c", new Rdn( "a=\"b,c\"" ).getNormName() );
+        assertEquals( "a=\"b,c\"", new Rdn( "a=\"b,c\"" ).getName() );
 
         assertTrue( RdnParser.isValid( "a=\"b\\,c\"" ) );
-        RDN rdn = new RDN( "a=\"b\\,c\"" );
+        Rdn rdn = new Rdn( "a=\"b\\,c\"" );
         assertEquals( "a=\"b\\,c\"", rdn.getName() );
         assertEquals( "a=b\\,c", rdn.getNormName() );
     }
@@ -1391,8 +1391,8 @@ public class RdnTest
     {
         // Use upper case attribute types to test if normalized types are used 
         // for comparison
-        RDN rdn = new RDN( " A = b + C = d" );
-        RDN clonedRdn = ( RDN ) rdn.clone();
+        Rdn rdn = new Rdn( " A = b + C = d" );
+        Rdn clonedRdn = (Rdn) rdn.clone();
 
         assertEquals( 0, rdn.compareTo( clonedRdn ) );
         assertEquals( true, rdn.equals( clonedRdn ) );
@@ -1410,8 +1410,8 @@ public class RdnTest
     {
         // Use upper case attribute types to test if normalized types are used 
         // for comparison
-        RDN rdn = new RDN( " A = b + C = d" );
-        RDN copiedRdn = new RDN( rdn );
+        Rdn rdn = new Rdn( " A = b + C = d" );
+        Rdn copiedRdn = new Rdn( rdn );
 
         assertEquals( 0, rdn.compareTo( copiedRdn ) );
         assertEquals( true, rdn.equals( copiedRdn ) );
@@ -1419,12 +1419,12 @@ public class RdnTest
 
 
     /**
-     * test the UpName method on a RDN with more than one atav
+     * test the UpName method on a Rdn with more than one atav
      */
     @Test 
     public void testGetUpNameMultipleAtav() throws LdapException
     {
-        RDN rdn = new RDN( " A = b + C = d " );
+        Rdn rdn = new Rdn( " A = b + C = d " );
         
         assertEquals( " A = b + C = d ", rdn.getName() );
     }

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java Sun Jan 23 01:17:06 2011
@@ -42,7 +42,7 @@ public class SchemaUtilsTest
     public static LdapSyntax[] getSyntaxes()
     {
         LdapSyntax[] syntaxes = new LdapSyntax[3];
-        syntaxes[0] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.12", "DN syntax", true );
+        syntaxes[0] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.12", "Dn syntax", true );
         syntaxes[1] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.15", "Directory String syntax", true );
         syntaxes[2] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.58", "Substring assertion syntax", true );
         

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import java.util.List;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.trigger.TriggerSpecification.SPSpec;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -157,7 +157,7 @@ public class TriggerSpecificationParserT
         assertEquals( theSpec.getOptions().size(), 1 );
         assertTrue( theSpec.getOptions().contains(
             new StoredProcedureSearchContextOption(
-                new DN( "cn=Logger,ou=Stored Procedures,ou=system" ), SearchScope.ONELEVEL ) ) );
+                new Dn( "cn=Logger,ou=Stored Procedures,ou=system" ), SearchScope.ONELEVEL ) ) );
         assertEquals( theSpec.getParameters().size(), 2 );
         assertTrue( theSpec.getParameters().contains(
             StoredProcedureParameter.ModifyDN_ENTRY.instance() ) );
@@ -189,7 +189,7 @@ public class TriggerSpecificationParserT
         assertTrue( theSpec.getParameters().contains(
             StoredProcedureParameter.Delete_DELETED_ENTRY.instance() ) );
         assertTrue( theSpec.getParameters().contains(
-            StoredProcedureParameter.Generic_LDAP_CONTEXT.instance( new DN( "ou=Backup,ou=System" ) ) ) );
+            StoredProcedureParameter.Generic_LDAP_CONTEXT.instance( new Dn( "ou=Backup,ou=System" ) ) ) );
     }
     
     @Test
@@ -218,7 +218,7 @@ public class TriggerSpecificationParserT
         assertTrue( firstSpec.getParameters().contains(
             StoredProcedureParameter.Delete_DELETED_ENTRY.instance() ) );
         assertTrue( firstSpec.getParameters().contains(
-            StoredProcedureParameter.Generic_LDAP_CONTEXT.instance( new DN( "ou=Backup,ou=System" ) ) ) );
+            StoredProcedureParameter.Generic_LDAP_CONTEXT.instance( new Dn( "ou=Backup,ou=System" ) ) ) );
         SPSpec secondSpec = spSpecs.get( 1 );
         assertEquals( secondSpec.getName(), "BackupUtilities.recreateDeletedEntry" );
         assertEquals( secondSpec.getOptions().size(), 0 );



Mime
View raw message