directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1073558 - in /directory/shared/trunk: integ/src/test/java/org/apache/directory/shared/ldap/name/ ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/
Date Wed, 23 Feb 2011 00:23:56 GMT
Author: elecharny
Date: Wed Feb 23 00:23:55 2011
New Revision: 1073558

URL: http://svn.apache.org/viewvc?rev=1073558&view=rev
Log:
Minor refactoring

Modified:
    directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/AvaTest.java
    directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
    directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/AvaTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/AvaTest.java?rev=1073558&r1=1073557&r2=1073558&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/AvaTest.java
(original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/AvaTest.java
Wed Feb 23 00:23:55 2011
@@ -204,8 +204,6 @@ public class AvaTest
     {
         Ava atav = new Ava( schemaManager, "CN", "Test" );
 
-        atav.normalize();
-
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
 
@@ -318,8 +316,6 @@ public class AvaTest
     {
         Ava atav = new Ava( schemaManager, "CN", "Test" );
 
-        atav.normalize();
-
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
 

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java?rev=1073558&r1=1073557&r2=1073558&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
(original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
Wed Feb 23 00:23:55 2011
@@ -76,7 +76,6 @@ public class MultiThreadedTest
 
         referenceAva = new Ava( schemaManager, "ou", "System" );
         sharedAva = new Ava( schemaManager, "ou", "System" );
-        sharedAva.normalize();
     }
 
 
@@ -96,7 +95,6 @@ public class MultiThreadedTest
     @Test
     public void testNormalizeHashCode() throws Exception
     {
-        sharedAva.normalize();
         assertEquals( referenceAva.hashCode(), sharedAva.hashCode() );
 
         sharedRdn.normalize( schemaManager );
@@ -110,7 +108,6 @@ public class MultiThreadedTest
     @Test
     public void testNormalizeEquals() throws Exception
     {
-        sharedAva.normalize();
         assertEquals( referenceAva, sharedAva );
         assertTrue( referenceAva.equals( sharedAva ) );
         assertTrue( sharedAva.equals( referenceAva ) );

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java?rev=1073558&r1=1073557&r2=1073558&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
Wed Feb 23 00:23:55 2011
@@ -605,6 +605,7 @@ public final class Ava implements Extern
         
         return sb.toString();
     }
+    
 
     /**
      * A Normalized String representation of a Ava :
@@ -656,6 +657,7 @@ public final class Ava implements Extern
 
         return result;
     }
+    
 
     /**
      * @see Object#equals(Object)

Modified: directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java?rev=1073558&r1=1073557&r2=1073558&view=diff
==============================================================================
--- directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
(original)
+++ directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
Wed Feb 23 00:23:55 2011
@@ -472,7 +472,7 @@ public class Rdn implements Cloneable, E
                         sb.append( '+' );
                     }
 
-                    sb.append( ata.normalize() );
+                    sb.append( ata.getNormName() );
                 }
 
                 normName = sb.toString();



Mime
View raw message