directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r411416 [3/3] - in /directory/branches/shared/optimization/ldap/src: main/antlr/ main/java/org/apache/directory/shared/ldap/codec/ main/java/org/apache/directory/shared/ldap/codec/add/ main/java/org/apache/directory/shared/ldap/codec/bind/ ...
Date Sat, 03 Jun 2006 10:07:54 GMT
Modified: directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java
URL: http://svn.apache.org/viewvc/directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java?rev=411416&r1=411415&r2=411416&view=diff
==============================================================================
--- directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java
(original)
+++ directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java
Sat Jun  3 03:07:50 2006
@@ -2041,7 +2041,7 @@
         list.add( "ou= Some   People   " );
         list.add( "dc = eXample" );
         list.add( "dc= cOm" );
-        Name name = new LdapDN( list.iterator() );
+        LdapDN name = new LdapDN( list.iterator() );
 
         Map oids = new HashMap();
 
@@ -2064,7 +2064,7 @@
      */
     public void testLdapNameToNameEmpty() throws Exception
     {
-        Name name = new LdapDN();
+        LdapDN name = new LdapDN();
 
         Map oids = new HashMap();
 
@@ -2085,7 +2085,7 @@
      */
     public void testLdapNameToNameMultiNC() throws Exception
     {
-        Name name = new LdapDN(
+        LdapDN name = new LdapDN(
             "2.5.4.11= Some   People   + 0.9.2342.19200300.100.1.25=  And   Some anImAls,0.9.2342.19200300.100.1.25
= eXample,dc= cOm" );
 
         Map oids = new HashMap();
@@ -2112,7 +2112,7 @@
      */
     public void testLdapNameToNameAliasMultiNC() throws Exception
     {
-        Name name = new LdapDN(
+        LdapDN name = new LdapDN(
             "2.5.4.11= Some   People   + domainComponent=  And   Some anImAls,DomainComponent
= eXample,0.9.2342.19200300.100.1.25= cOm" );
 
         Map oids = new HashMap();
@@ -2124,7 +2124,7 @@
         oids.put( "organizationalUnitName", new OidNormalizer( "ou", new DeepTrimToLowerNormalizer()
) );
         oids.put( "2.5.4.11", new OidNormalizer( "ou", new DeepTrimToLowerNormalizer() )
);
 
-        Name result = LdapDN.normalize( name, oids );
+        LdapDN result = LdapDN.normalize( name, oids );
 
         assertTrue( result.toString().equals( "dc=and some animals+ou=some people,dc=example,dc=com"
) );
         assertTrue( ( ( LdapDN ) result )
@@ -2141,7 +2141,7 @@
      */
     public void testNameSerialization() throws Exception
     {
-        Name name = new LdapDN( "ou= Some   People   + dc=  And   Some anImAls,dc = eXample,dc=
cOm" );
+        LdapDN name = new LdapDN( "ou= Some   People   + dc=  And   Some anImAls,dc = eXample,dc=
cOm" );
 
         FileOutputStream fOut = null;
         ObjectOutputStream oOut = null;

Modified: directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
URL: http://svn.apache.org/viewvc/directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java?rev=411416&r1=411415&r2=411416&view=diff
==============================================================================
--- directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
(original)
+++ directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
Sat Jun  3 03:07:50 2006
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.filter.AbstractExprNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
-import org.apache.directory.shared.ldap.name.LdapName;
+import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.SimpleNameComponentNormalizer;
 import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
@@ -176,22 +176,22 @@
         SubtreeSpecification ss = parser.parse( SPEC_WITH_SPECIFICEXCLUSIONS );
         assertFalse( ss.getChopBeforeExclusions().isEmpty() );
         assertFalse( ss.getChopAfterExclusions().isEmpty() );
-        assertTrue( ss.getChopBeforeExclusions().contains( new LdapName( "ab=cd" ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new LdapName( "ef=gh" ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new LdapDN( "ab=cd" ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new LdapDN( "ef=gh" ) ) );
 
         // try a second time
         ss = parser.parse( SPEC_WITH_SPECIFICEXCLUSIONS );
         assertFalse( ss.getChopBeforeExclusions().isEmpty() );
         assertFalse( ss.getChopAfterExclusions().isEmpty() );
-        assertTrue( ss.getChopBeforeExclusions().contains( new LdapName( "ab=cd" ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new LdapName( "ef=gh" ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new LdapDN( "ab=cd" ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new LdapDN( "ef=gh" ) ) );
 
         // try a third time
         ss = parser.parse( SPEC_WITH_SPECIFICEXCLUSIONS );
         assertFalse( ss.getChopBeforeExclusions().isEmpty() );
         assertFalse( ss.getChopAfterExclusions().isEmpty() );
-        assertTrue( ss.getChopBeforeExclusions().contains( new LdapName( "ab=cd" ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new LdapName( "ef=gh" ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new LdapDN( "ab=cd" ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new LdapDN( "ef=gh" ) ) );
     }
 
 
@@ -237,7 +237,7 @@
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE_AND_MINIMUM_AND_MAXIMUM );
 
-        assertEquals( new LdapName( "ou=ORGANIZATION UNIT" ), ss.getBase() );
+        assertEquals( new LdapDN( "ou=ORGANIZATION UNIT" ), ss.getBase() );
         assertEquals( 1, ss.getMinBaseDistance() );
         assertEquals( 2, ss.getMaxBaseDistance() );
     }
@@ -253,10 +253,10 @@
         assertNotNull( ss );
 
         assertEquals( "ou=people", ss.getBase().toString() );
-        assertTrue( ss.getChopBeforeExclusions().contains( new LdapName( "x=y" ) ) );
-        assertTrue( ss.getChopBeforeExclusions().contains( new LdapName( "y=z" ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new LdapName( "k=l" ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new LdapName( "l=m" ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new LdapDN( "x=y" ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new LdapDN( "y=z" ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new LdapDN( "k=l" ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new LdapDN( "l=m" ) ) );
         assertEquals( 7, ss.getMinBaseDistance() );
         assertEquals( 77, ss.getMaxBaseDistance() );
     }



Mime
View raw message