directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r581295 - in /directory/shared/branches/bigbang/ldap/src: main/java/org/apache/directory/shared/ldap/common/ test/java/org/apache/directory/shared/ldap/common/
Date Tue, 02 Oct 2007 16:32:23 GMT
Author: elecharny
Date: Tue Oct  2 09:32:22 2007
New Revision: 581295

URL: http://svn.apache.org/viewvc?rev=581295&view=rev
Log:
Renamed the getDN, setDN and getOIDs methods to getDn, setDn and getOids

Modified:
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntry.java
    directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntryImpl.java
    directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/common/ServerEntryTest.java

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntry.java?rev=581295&r1=581294&r2=581295&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntry.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntry.java
Tue Oct  2 09:32:22 2007
@@ -114,7 +114,7 @@
      *
      * @return The entry DN
      */
-    public LdapDN getDN();
+    public LdapDN getDn();
     
 
     /**
@@ -122,7 +122,7 @@
      * 
      * @param dn The LdapdN associated with this entry
      */
-    public void setDN( LdapDN dn);
+    public void setDn( LdapDN dn);
     
 
     /**
@@ -132,7 +132,7 @@
      * 
      * @return an enumeration of the OIDs of all contained attributes
      */
-    Iterator<OID> getOIDs();
+    Iterator<OID> getOids();
     
     
     /**

Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntryImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntryImpl.java?rev=581295&r1=581294&r2=581295&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntryImpl.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/common/ServerEntryImpl.java
Tue Oct  2 09:32:22 2007
@@ -193,7 +193,7 @@
      *
      * @return The entry DN
      */
-    public LdapDN getDN()
+    public LdapDN getDn()
     {
         return dn;
     }
@@ -204,7 +204,7 @@
      * 
      * @param dn The LdapdN associated with this entry
      */
-    public void setDN( LdapDN dn)
+    public void setDn( LdapDN dn)
     {
         this.dn = dn;
     }
@@ -351,7 +351,7 @@
      * 
      * @return an iterator of the OIDs of all contained attributes
      */
-    public Iterator<OID> getOIDs()
+    public Iterator<OID> getOids()
     {
         return new OidIterator();
     }

Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/common/ServerEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/common/ServerEntryTest.java?rev=581295&r1=581294&r2=581295&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/common/ServerEntryTest.java
(original)
+++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/common/ServerEntryTest.java
Tue Oct  2 09:32:22 2007
@@ -49,7 +49,7 @@
     {
         ServerEntry entry = new ServerEntryImpl();
         
-        assertNull( entry.getDN() );
+        assertNull( entry.getDn() );
         assertEquals( 0, entry.size() );
     }
 
@@ -63,7 +63,7 @@
         
         ServerEntry entry = new ServerEntryImpl( dn );
         
-        assertEquals( dn, entry.getDN() );
+        assertEquals( dn, entry.getDn() );
         assertEquals( 0, entry.size() );
     }
 
@@ -77,9 +77,9 @@
         LdapDN newDn = new LdapDN( "dc=real, dc=org" );
         
         ServerEntry entry = new ServerEntryImpl( dn );
-        entry.setDN( newDn );
+        entry.setDn( newDn );
         
-        assertEquals( newDn, entry.getDN() );
+        assertEquals( newDn, entry.getDn() );
         assertEquals( 0, entry.size() );
     }
     
@@ -114,14 +114,14 @@
         entry.put(  attr2 );
         entry.put(  attr3 );
         
-        assertEquals( dn, entry.getDN() );
+        assertEquals( dn, entry.getDn() );
         assertEquals( 3, entry.size() );
         
         ServerAttribute attr = entry.get( oid2 );
         assertNotNull( attr );
         assertEquals( oid2, attr.getOid() );
         
-        Iterator<OID> oids = entry.getOIDs();
+        Iterator<OID> oids = entry.getOids();
         OID[] expected = new OID[]{oid1, oid2, oid3};
         int i = 0;
         
@@ -133,6 +133,7 @@
         }
     }
 
+    
     /**
      * Test the size method
      */
@@ -187,29 +188,28 @@
         assertEquals( 0, entry.size() );
     }
     
+    
     /**
-     * Test the getDN/setDN method
+     * Test the getDn/setDn method
      */
-    @Test public void testGetSetDN() throws InvalidNameException
+    @Test public void testGetsetDn() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "dc=example, dc=org" );
         
         ServerEntry entry = new ServerEntryImpl( dn );
         
-        assertEquals( dn, entry.getDN() );
+        assertEquals( dn, entry.getDn() );
 
         ServerEntry entry2 = new ServerEntryImpl();
         
-        assertNull( entry2.getDN() );
+        assertNull( entry2.getDn() );
         
-        entry2.setDN( dn );
+        entry2.setDn( dn );
         
-        assertEquals( dn, entry2.getDN() );
+        assertEquals( dn, entry2.getDn() );
     }
     
 
-
-
     /**
      * Test the getOIDs method
      */
@@ -232,7 +232,7 @@
         entry.put( attr2 );
         entry.put( oid3, oid3.toString() );
         
-        Iterator<OID> iterOids = entry.getOIDs();
+        Iterator<OID> iterOids = entry.getOids();
         int i = 0;
         
         while ( iterOids.hasNext() )
@@ -270,6 +270,7 @@
         assertNull( entry.remove( oid2 ) );
     }
 
+    
     /**
      * Test the clone method
      */
@@ -302,7 +303,7 @@
         assertEquals( attr2, clone.get( oid2 ) );
         assertEquals( attr3, clone.get( oid3 ) );
         
-        // Modify the inital attribute
+        // Modify the initial attribute
         entry.remove( oid1 );
         assertNull( entry.get( oid1 ) );
         assertEquals( attr1, clone.get( oid1 ) );



Mime
View raw message