directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1087515 [2/2] - in /directory/shared/trunk: dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ integ/src/test/java/org/apache/directory/shared/ldap/en...
Date Fri, 01 Apr 2011 00:05:18 GMT
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java Fri Apr  1 00:05:17 2011
@@ -78,7 +78,7 @@ public class DefaultEntryAttributeTest
     /**
      * Serialize a DefaultEntryAttribute
      */
-    private ByteArrayOutputStream serializeValue( DefaultEntryAttribute value ) throws IOException
+    private ByteArrayOutputStream serializeValue( DefaultAttribute value ) throws IOException
     {
         ObjectOutputStream oOut = null;
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -115,7 +115,7 @@ public class DefaultEntryAttributeTest
     /**
      * Deserialize a DefaultEntryAttribute
      */
-    private DefaultEntryAttribute deserializeValue( ByteArrayOutputStream out ) throws IOException, ClassNotFoundException
+    private DefaultAttribute deserializeValue( ByteArrayOutputStream out ) throws IOException, ClassNotFoundException
     {
         ObjectInputStream oIn = null;
         ByteArrayInputStream in = new ByteArrayInputStream( out.toByteArray() );
@@ -124,7 +124,7 @@ public class DefaultEntryAttributeTest
         {
             oIn = new ObjectInputStream( in );
 
-            DefaultEntryAttribute value = ( DefaultEntryAttribute ) oIn.readObject();
+            DefaultAttribute value = ( DefaultAttribute ) oIn.readObject();
 
             return value;
         }
@@ -164,7 +164,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testDefaultClientAttribute()
     {
-        Attribute attr = new DefaultEntryAttribute();
+        Attribute attr = new DefaultAttribute();
         
         assertFalse( attr.isHumanReadable() );
         assertEquals( 0, attr.size() );
@@ -179,7 +179,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testDefaultClientAttributeString()
     {
-        Attribute attr = new DefaultEntryAttribute( "TEST" );
+        Attribute attr = new DefaultAttribute( "TEST" );
         
         assertFalse( attr.isHumanReadable() );
         assertEquals( 0, attr.size() );
@@ -194,7 +194,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testDefaultClientAttributeStringValueArray()
     {
-        Attribute attr = new DefaultEntryAttribute( "Test", STR_VALUE1, STR_VALUE2 );
+        Attribute attr = new DefaultAttribute( "Test", STR_VALUE1, STR_VALUE2 );
         
         assertTrue( attr.isHumanReadable() );
         assertEquals( 2, attr.size() );
@@ -211,7 +211,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testDefaultClientAttributeStringStringArray()
     {
-        Attribute attr = new DefaultEntryAttribute( "Test", "a", "b" );
+        Attribute attr = new DefaultAttribute( "Test", "a", "b" );
         
         assertTrue( attr.isHumanReadable() );
         assertEquals( 2, attr.size() );
@@ -228,7 +228,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testDefaultClientAttributeStringBytesArray()
     {
-        Attribute attr = new DefaultEntryAttribute( "Test", BYTES1, BYTES2 );
+        Attribute attr = new DefaultAttribute( "Test", BYTES1, BYTES2 );
         
         assertFalse( attr.isHumanReadable() );
         assertEquals( 2, attr.size() );
@@ -245,17 +245,17 @@ public class DefaultEntryAttributeTest
     @Test
     public void testGetBytes() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         attr1.add( (byte[])null );
         assertNull( attr1.getBytes() );
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         attr2.add( BYTES1, BYTES2 );
         assertTrue( Arrays.equals( BYTES1, attr2.getBytes() ) );
         
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
         
         attr3.add( "a", "b" );
         
@@ -277,17 +277,17 @@ public class DefaultEntryAttributeTest
     @Test
     public void testGetString() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         attr1.add( (String)null );
         assertEquals( "", attr1.getString() );
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         attr2.add( "a", "b" );
         assertEquals( "a", attr2.getString() );
         
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
         
         attr3.add( BYTES1, BYTES2 );
         
@@ -309,7 +309,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testGetId()
     {
-        Attribute attr = new DefaultEntryAttribute();
+        Attribute attr = new DefaultAttribute();
 
         assertNull( attr.getId() );
         
@@ -327,7 +327,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testSetId()
     {
-        Attribute attr = new DefaultEntryAttribute();
+        Attribute attr = new DefaultAttribute();
 
         try
         {
@@ -373,7 +373,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testGetUpId()
     {
-        Attribute attr = new DefaultEntryAttribute();
+        Attribute attr = new DefaultAttribute();
 
         assertNull( attr.getUpId() );
         
@@ -391,7 +391,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testSetUpId()
     {
-        Attribute attr = new DefaultEntryAttribute();
+        Attribute attr = new DefaultAttribute();
 
         try
         {
@@ -439,7 +439,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testIsValidSyntaxChecker() throws LdapException
     {
-        Attribute attr = new DefaultEntryAttribute( "test" );
+        Attribute attr = new DefaultAttribute( "test" );
         
         attr.add( "test", "another test" );
         
@@ -456,7 +456,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testIterator() throws LdapException
     {
-        Attribute attr = new DefaultEntryAttribute();
+        Attribute attr = new DefaultAttribute();
         attr.add(  "a", "b", "c" );
         
         Iterator<Value<?>> iter = attr.iterator();
@@ -480,21 +480,21 @@ public class DefaultEntryAttributeTest
     @Test
     public void testAddValueArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         int nbAdded = attr1.add( new StringValue( (String)null ) );
         assertEquals( 1, nbAdded );
         assertTrue( attr1.isHumanReadable() );
         assertEquals( NULL_STRING_VALUE, attr1.get() );
         
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         nbAdded = attr2.add( new BinaryValue( (byte[])null ) );
         assertEquals( 1, nbAdded );
         assertFalse( attr2.isHumanReadable() );
         assertEquals( NULL_BINARY_VALUE, attr2.get() );
         
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
         
         nbAdded = attr3.add( new StringValue( "a" ), new StringValue( "b" ) );
         assertEquals( 2, nbAdded );
@@ -502,7 +502,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr3.contains( "a" ) );
         assertTrue( attr3.contains( "b" ) );
         
-        Attribute attr4 = new DefaultEntryAttribute( "test" );
+        Attribute attr4 = new DefaultAttribute( "test" );
         
         nbAdded = attr4.add( new BinaryValue( BYTES1 ), new BinaryValue( BYTES2 ) );
         assertEquals( 2, nbAdded );
@@ -510,7 +510,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr4.contains( BYTES1 ) );
         assertTrue( attr4.contains( BYTES2 ) );
         
-        Attribute attr5 = new DefaultEntryAttribute( "test" );
+        Attribute attr5 = new DefaultAttribute( "test" );
         
         nbAdded = attr5.add( new StringValue( "c" ), new BinaryValue( BYTES1 ) );
         assertEquals( 2, nbAdded );
@@ -518,7 +518,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr5.contains( "ab" ) );
         assertTrue( attr5.contains( "c" ) );
 
-        Attribute attr6 = new DefaultEntryAttribute( "test" );
+        Attribute attr6 = new DefaultAttribute( "test" );
         
         nbAdded = attr6.add( new BinaryValue( BYTES1 ), new StringValue( "c" ) );
         assertEquals( 2, nbAdded );
@@ -526,7 +526,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr6.contains( BYTES1 ) );
         assertTrue( attr6.contains( BYTES3 ) );
 
-        Attribute attr7 = new DefaultEntryAttribute( "test" );
+        Attribute attr7 = new DefaultAttribute( "test" );
         
         nbAdded = attr7.add( new BinaryValue( (byte[])null ), new StringValue( "c" ) );
         assertEquals( 2, nbAdded );
@@ -534,7 +534,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr7.contains( NULL_BINARY_VALUE ) );
         assertTrue( attr7.contains( BYTES3 ) );
 
-        Attribute attr8 = new DefaultEntryAttribute( "test" );
+        Attribute attr8 = new DefaultAttribute( "test" );
         
         nbAdded = attr8.add( new StringValue( (String)null ), new BinaryValue( BYTES1 ) );
         assertEquals( 2, nbAdded );
@@ -550,28 +550,28 @@ public class DefaultEntryAttributeTest
     @Test
     public void testAddStringArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         int nbAdded = attr1.add( (String)null );
         assertEquals( 1, nbAdded );
         assertTrue( attr1.isHumanReadable() );
         assertEquals( NULL_STRING_VALUE, attr1.get() );
         
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         nbAdded = attr2.add( "" );
         assertEquals( 1, nbAdded );
         assertTrue( attr2.isHumanReadable() );
         assertEquals( "", attr2.getString() );
         
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
         
         nbAdded = attr3.add( "t" );
         assertEquals( 1, nbAdded );
         assertTrue( attr3.isHumanReadable() );
         assertEquals( "t", attr3.getString() );
         
-        Attribute attr4 = new DefaultEntryAttribute( "test" );
+        Attribute attr4 = new DefaultAttribute( "test" );
         
         nbAdded = attr4.add( "a", "b", "c", "d" );
         assertEquals( 4, nbAdded );
@@ -603,7 +603,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr4.contains( "e" ) );
         assertFalse( attr4.contains( "ab" ) );
         
-        Attribute attr5 = new DefaultEntryAttribute( "test" );
+        Attribute attr5 = new DefaultAttribute( "test" );
         
         nbAdded = attr5.add( "a", "b", (String)null, "d" );
         assertEquals( 4, nbAdded );
@@ -613,7 +613,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr5.contains( (String)null ) );
         assertTrue( attr5.contains( "d" ) );
 
-        Attribute attr6 = new DefaultEntryAttribute( "test" );
+        Attribute attr6 = new DefaultAttribute( "test" );
         
         nbAdded = attr6.add( "a", (String)null );
         assertEquals( 2, nbAdded );
@@ -621,7 +621,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr6.contains( "a" ) );
         assertTrue( attr6.contains( (String)null ) );
         
-        Attribute attr7 = new DefaultEntryAttribute( "test" );
+        Attribute attr7 = new DefaultAttribute( "test" );
         
         attr7.add( "a", "b" );
         assertEquals( 2, attr7.size() );
@@ -638,28 +638,28 @@ public class DefaultEntryAttributeTest
     @Test
     public void testAddByteArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         int nbAdded = attr1.add( (byte[])null );
         assertEquals( 1, nbAdded );
         assertFalse( attr1.isHumanReadable() );
         assertTrue( Arrays.equals( NULL_BINARY_VALUE.getBytes(), attr1.getBytes() ) );
         
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         nbAdded = attr2.add( StringConstants.EMPTY_BYTES );
         assertEquals( 1, nbAdded );
         assertFalse( attr2.isHumanReadable() );
         assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, attr2.getBytes() ) );
         
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
         
         nbAdded = attr3.add( BYTES1 );
         assertEquals( 1, nbAdded );
         assertFalse( attr3.isHumanReadable() );
         assertTrue( Arrays.equals( BYTES1, attr3.getBytes() ) );
         
-        Attribute attr4 = new DefaultEntryAttribute( "test" );
+        Attribute attr4 = new DefaultAttribute( "test" );
         
         nbAdded = attr4.add( BYTES1, BYTES2, BYTES3, BYTES4 );
         assertEquals( 4, nbAdded );
@@ -669,7 +669,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr4.contains( BYTES3 ) );
         assertTrue( attr4.contains( BYTES4 ) );
         
-        Attribute attr5 = new DefaultEntryAttribute( "test" );
+        Attribute attr5 = new DefaultAttribute( "test" );
         
         nbAdded = attr5.add( BYTES1, BYTES2, (byte[])null, BYTES3 );
         assertEquals( 4, nbAdded );
@@ -679,7 +679,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr5.contains( (byte[])null ) );
         assertTrue( attr5.contains( BYTES3 ) );
 
-        Attribute attr6 = new DefaultEntryAttribute( "test" );
+        Attribute attr6 = new DefaultAttribute( "test" );
         
         nbAdded = attr6.add( BYTES1, (byte[])null );
         assertEquals( 2, nbAdded );
@@ -695,7 +695,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testClear() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         
@@ -706,7 +706,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr1.isHumanReadable() );
         assertEquals( 0, attr1.size() );
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         attr2.add( BYTES1, BYTES2 );
         assertEquals( 2, attr2.size() );
         assertFalse( attr2.isHumanReadable() );
@@ -722,7 +722,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testContainsValueArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         assertFalse( attr1.contains( STR_VALUE1 ) );
@@ -746,7 +746,7 @@ public class DefaultEntryAttributeTest
         assertFalse( attr1.contains( NULL_STRING_VALUE ) );
         assertTrue( attr1.contains( STR_VALUE1, BIN_VALUE2 ) );
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         assertEquals( 0, attr2.size() );
         assertFalse( attr2.contains( BYTES1 ) );
         assertFalse( attr2.contains( NULL_BINARY_VALUE ) );
@@ -775,7 +775,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testContainsStringArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         assertFalse( attr1.contains( "a" ) );
@@ -797,7 +797,7 @@ public class DefaultEntryAttributeTest
         assertFalse( attr1.contains( "e" ) );
         assertFalse( attr1.contains( (String)null ) );
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         assertEquals( 0, attr2.size() );
         assertFalse( attr2.contains( BYTES1 ) );
         assertFalse( attr2.contains( (byte[])null ) );
@@ -825,7 +825,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testContainsByteArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         assertFalse( attr1.contains( BYTES1 ) );
@@ -847,7 +847,7 @@ public class DefaultEntryAttributeTest
         assertFalse( attr1.contains( BYTES4 ) );
         assertFalse( attr1.contains( (byte[])null ) );
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         assertEquals( 0, attr2.size() );
         assertFalse( attr2.contains( "a" ) );
         assertFalse( attr2.contains( (String)null ) );
@@ -875,12 +875,12 @@ public class DefaultEntryAttributeTest
     @Test
     public void testGet() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         attr1.add( (String)null );
         assertEquals( NULL_STRING_VALUE,attr1.get() );
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         attr2.add( "a", "b", "c" );
         assertEquals( "a", attr2.get().getString() );
@@ -894,7 +894,7 @@ public class DefaultEntryAttributeTest
         attr2.remove( "c" );
         assertNull( attr2.get() );
 
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
         
         attr3.add( BYTES1, BYTES2, BYTES3 );
         assertTrue( Arrays.equals( BYTES1, attr3.get().getBytes() ) );
@@ -916,7 +916,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testGetAll() throws LdapException
     {
-        Attribute attr = new DefaultEntryAttribute( "test" );
+        Attribute attr = new DefaultAttribute( "test" );
         
         Iterator<Value<?>> iterator = attr.getAll(); 
         assertFalse( iterator.hasNext() );
@@ -948,14 +948,14 @@ public class DefaultEntryAttributeTest
     @Test
     public void testSize() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
 
         assertEquals( 0, attr1.size() );
         
         attr1.add( (String)null );
         assertEquals( 1, attr1.size() );
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         attr2.add( "a", "b" );
         assertEquals( 2, attr2.size() );
@@ -971,7 +971,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testRemoveValueArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
 
         assertFalse( attr1.remove( STR_VALUE1 ) );
         assertFalse( attr1.remove( STR_VALUE1 ) );
@@ -1001,7 +1001,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr1.remove( NULL_STRING_VALUE, STR_VALUE1 ) );
         assertEquals( 1, attr1.size() );
         
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
 
         assertFalse( attr2.remove( BIN_VALUE1 ) );
         
@@ -1040,7 +1040,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testRemoveByteArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
 
         assertFalse( attr1.remove( BYTES1 ) );
         
@@ -1063,7 +1063,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr1.remove( (byte[])null, BYTES1 ) );
         assertEquals( 1, attr1.size() );
         
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         attr2.add( "ab", "b", "c" );
         
@@ -1079,7 +1079,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testRemoveStringArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
 
         assertFalse( attr1.remove( "a" ) );
         
@@ -1102,7 +1102,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr1.remove( (String )null, "a" ) );
         assertEquals( 1, attr1.size() );
         
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         attr2.add( BYTES1, BYTES2, BYTES3 );
         
@@ -1118,28 +1118,28 @@ public class DefaultEntryAttributeTest
     @Test
     public void testPutStringArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         int nbAdded = attr1.add( (String)null );
         assertEquals( 1, nbAdded );
         assertTrue( attr1.isHumanReadable() );
         assertEquals( NULL_STRING_VALUE, attr1.get() );
         
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         nbAdded = attr2.add( "" );
         assertEquals( 1, nbAdded );
         assertTrue( attr2.isHumanReadable() );
         assertEquals( "", attr2.getString() );
         
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
         
         nbAdded = attr3.add( "t" );
         assertEquals( 1, nbAdded );
         assertTrue( attr3.isHumanReadable() );
         assertEquals( "t", attr3.getString() );
         
-        Attribute attr4 = new DefaultEntryAttribute( "test" );
+        Attribute attr4 = new DefaultAttribute( "test" );
         
         nbAdded = attr4.add( "a", "b", "c", "d" );
         assertEquals( 4, nbAdded );
@@ -1149,7 +1149,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr4.contains( "c" ) );
         assertTrue( attr4.contains( "d" ) );
         
-        Attribute attr5 = new DefaultEntryAttribute( "test" );
+        Attribute attr5 = new DefaultAttribute( "test" );
         
         nbAdded = attr5.add( "a", "b", (String)null, "d" );
         assertEquals( 4, nbAdded );
@@ -1159,7 +1159,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr5.contains( (String)null ) );
         assertTrue( attr5.contains( "d" ) );
 
-        Attribute attr6 = new DefaultEntryAttribute( "test" );
+        Attribute attr6 = new DefaultAttribute( "test" );
         
         nbAdded = attr6.add( "a", (String)null );
         assertEquals( 2, nbAdded );
@@ -1175,28 +1175,28 @@ public class DefaultEntryAttributeTest
     @Test
     public void testPutByteArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         int nbAdded = attr1.add( (byte[])null );
         assertEquals( 1, nbAdded );
         assertFalse( attr1.isHumanReadable() );
         assertTrue( Arrays.equals( NULL_BINARY_VALUE.getBytes(), attr1.getBytes() ) );
         
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         nbAdded = attr2.add( StringConstants.EMPTY_BYTES );
         assertEquals( 1, nbAdded );
         assertFalse( attr2.isHumanReadable() );
         assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, attr2.getBytes() ) );
         
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
         
         nbAdded = attr3.add( BYTES1 );
         assertEquals( 1, nbAdded );
         assertFalse( attr3.isHumanReadable() );
         assertTrue( Arrays.equals( BYTES1, attr3.getBytes() ) );
         
-        Attribute attr4 = new DefaultEntryAttribute( "test" );
+        Attribute attr4 = new DefaultAttribute( "test" );
         
         nbAdded = attr4.add( BYTES1, BYTES2 );
         assertEquals( 2, nbAdded );
@@ -1210,7 +1210,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr4.contains( BYTES3 ) );
         assertTrue( attr4.contains( BYTES4 ) );
         
-        Attribute attr5 = new DefaultEntryAttribute( "test" );
+        Attribute attr5 = new DefaultAttribute( "test" );
         
         nbAdded = attr5.add( BYTES1, BYTES2, (byte[])null, BYTES3 );
         assertEquals( 4, nbAdded );
@@ -1220,7 +1220,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr5.contains( (byte[])null ) );
         assertTrue( attr5.contains( BYTES3 ) );
 
-        Attribute attr6 = new DefaultEntryAttribute( "test" );
+        Attribute attr6 = new DefaultAttribute( "test" );
         
         nbAdded = attr6.add( BYTES1, (byte[])null );
         assertEquals( 2, nbAdded );
@@ -1236,7 +1236,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testPutValueArray() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         assertEquals( 0, attr1.size() );
         
@@ -1266,7 +1266,7 @@ public class DefaultEntryAttributeTest
         assertTrue( attr1.contains( STR_VALUE3 ) );
         
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         assertEquals( 0, attr2.size() );
         
         attr2.add( NULL_BINARY_VALUE );
@@ -1295,7 +1295,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testToString() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         assertEquals( "    test: (null)\n", attr1.toString() );
         
@@ -1305,7 +1305,7 @@ public class DefaultEntryAttributeTest
         attr1.add( "b" );
         assertEquals( "    test: a\n    test: b\n", attr1.toString() );
 
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
 
         attr2.add( BYTES1 );
         assertEquals( "    test: '0x61 0x62 '\n", attr2.toString() );
@@ -1321,11 +1321,11 @@ public class DefaultEntryAttributeTest
     @Test
     public void testHashCode() throws InvalidAttributeValueException, LdapException
     {
-        Attribute attr = new DefaultEntryAttribute();
+        Attribute attr = new DefaultAttribute();
         assertEquals( 37, attr.hashCode() );
 
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         assertEquals( attr1.hashCode(), attr2.hashCode() );
         
@@ -1348,8 +1348,8 @@ public class DefaultEntryAttributeTest
         attr2.add( "c", "b", "a" );
         assertNotSame( attr1.hashCode(), attr2.hashCode() );
         
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
-        Attribute attr4 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
+        Attribute attr4 = new DefaultAttribute( "test" );
         
         attr3.add( BYTES1, BYTES2 );
         attr4.add( BYTES1, BYTES2 );
@@ -1378,11 +1378,11 @@ public class DefaultEntryAttributeTest
     @Test
     public void testEquals() throws LdapException
     {
-        Attribute attr1 = new DefaultEntryAttribute( "test" );
+        Attribute attr1 = new DefaultAttribute( "test" );
         
         assertFalse( attr1.equals( null ) );
         
-        Attribute attr2 = new DefaultEntryAttribute( "test" );
+        Attribute attr2 = new DefaultAttribute( "test" );
         
         assertTrue( attr1.equals( attr2 ) );
         
@@ -1401,29 +1401,29 @@ public class DefaultEntryAttributeTest
         
         assertTrue( attr1.equals( attr2 ) );
         
-        Attribute attr3 = new DefaultEntryAttribute( "test" );
-        Attribute attr4 = new DefaultEntryAttribute( "test" );
+        Attribute attr3 = new DefaultAttribute( "test" );
+        Attribute attr4 = new DefaultAttribute( "test" );
         
         attr3.add( NULL_BINARY_VALUE );
         attr4.add( NULL_BINARY_VALUE );
         assertTrue( attr3.equals( attr4 ) );
         
-        Attribute attr5 = new DefaultEntryAttribute( "test" );
-        Attribute attr6 = new DefaultEntryAttribute( "test" );
+        Attribute attr5 = new DefaultAttribute( "test" );
+        Attribute attr6 = new DefaultAttribute( "test" );
         
         attr5.add( NULL_BINARY_VALUE );
         attr6.add( NULL_STRING_VALUE );
         assertFalse( attr5.equals( attr6 ) );
 
-        Attribute attr7 = new DefaultEntryAttribute( "test" );
-        Attribute attr8 = new DefaultEntryAttribute( "test" );
+        Attribute attr7 = new DefaultAttribute( "test" );
+        Attribute attr8 = new DefaultAttribute( "test" );
         
         attr7.add( "a" );
         attr8.add( BYTES2 );
         assertFalse( attr7.equals( attr8 ) );
 
-        Attribute attr9 = new DefaultEntryAttribute( "test" );
-        Attribute attr10 = new DefaultEntryAttribute( "test" );
+        Attribute attr9 = new DefaultAttribute( "test" );
+        Attribute attr10 = new DefaultAttribute( "test" );
         
         attr7.add( "a" );
         attr7.add( BYTES2 );
@@ -1438,7 +1438,7 @@ public class DefaultEntryAttributeTest
     @Test
     public void testClone() throws LdapException
     {
-        Attribute attr = new DefaultEntryAttribute( "test" );
+        Attribute attr = new DefaultAttribute( "test" );
         
         Attribute clone = attr.clone();
         
@@ -1464,11 +1464,11 @@ public class DefaultEntryAttributeTest
     @Test
     public void testSerializeCompleteAttribute() throws LdapException, IOException, ClassNotFoundException
     {
-        DefaultEntryAttribute dca = new DefaultEntryAttribute( "CommonName" );
+        DefaultAttribute dca = new DefaultAttribute( "CommonName" );
         dca.setUpId( "CN" );
         dca.add( "test1", "test2" );
 
-        DefaultEntryAttribute dcaSer = deserializeValue( serializeValue( dca ) );
+        DefaultAttribute dcaSer = deserializeValue( serializeValue( dca ) );
         assertEquals( dca.toString(), dcaSer.toString() );
         assertEquals( "cn", dcaSer.getId() );
         assertEquals( "CN", dcaSer.getUpId() );
@@ -1484,10 +1484,10 @@ public class DefaultEntryAttributeTest
     @Test
     public void testSerializeAttributeWithNoValue() throws LdapException, IOException, ClassNotFoundException
     {
-        DefaultEntryAttribute dca = new DefaultEntryAttribute( "CommonName" );
+        DefaultAttribute dca = new DefaultAttribute( "CommonName" );
         dca.setUpId( "CN" );
 
-        DefaultEntryAttribute dcaSer = deserializeValue( serializeValue( dca ) );
+        DefaultAttribute dcaSer = deserializeValue( serializeValue( dca ) );
         assertEquals( dca.toString(), dcaSer.toString() );
         assertEquals( "cn", dcaSer.getId() );
         assertEquals( "CN", dcaSer.getUpId() );
@@ -1502,11 +1502,11 @@ public class DefaultEntryAttributeTest
     @Test
     public void testSerializeAttributeNullValue() throws LdapException, IOException, ClassNotFoundException
     {
-        DefaultEntryAttribute dca = new DefaultEntryAttribute( "CommonName" );
+        DefaultAttribute dca = new DefaultAttribute( "CommonName" );
         dca.setUpId( "CN" );
         dca.add( (String)null );
 
-        DefaultEntryAttribute dcaSer = deserializeValue( serializeValue( dca ) );
+        DefaultAttribute dcaSer = deserializeValue( serializeValue( dca ) );
         assertEquals( dca.toString(), dcaSer.toString() );
         assertEquals( "cn", dcaSer.getId() );
         assertEquals( "CN", dcaSer.getUpId() );
@@ -1523,11 +1523,11 @@ public class DefaultEntryAttributeTest
     @Test
     public void testSerializeAttributeBinaryValue() throws LdapException, IOException, ClassNotFoundException
     {
-        DefaultEntryAttribute dca = new DefaultEntryAttribute( "UserPassword" );
+        DefaultAttribute dca = new DefaultAttribute( "UserPassword" );
         byte[] password = Strings.getBytesUtf8("secret");
         dca.add( password );
 
-        DefaultEntryAttribute dcaSer = deserializeValue( serializeValue( dca ) );
+        DefaultAttribute dcaSer = deserializeValue( serializeValue( dca ) );
         assertEquals( dca.toString(), dcaSer.toString() );
         assertEquals( "userpassword", dcaSer.getId() );
         assertEquals( "UserPassword", dcaSer.getUpId() );

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryAttributeSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryAttributeSerializationTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryAttributeSerializationTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryAttributeSerializationTest.java Fri Apr  1 00:05:17 2011
@@ -49,7 +49,7 @@ public class EntryAttributeSerialization
     @Test
     public void testEntryAttributeNoStringValueSerialization() throws IOException, ClassNotFoundException
     {
-        Attribute attribute1 = new DefaultEntryAttribute( "CN" );
+        Attribute attribute1 = new DefaultAttribute( "CN" );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -61,7 +61,7 @@ public class EntryAttributeSerialization
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        Attribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultAttribute();
         attribute2.readExternal( in );
 
         assertEquals( attribute1, attribute2 );
@@ -71,7 +71,7 @@ public class EntryAttributeSerialization
     @Test
     public void testEntryAttributeOneStringValueSerialization() throws IOException, ClassNotFoundException
     {
-        Attribute attribute1 = new DefaultEntryAttribute( "CN", "test" );
+        Attribute attribute1 = new DefaultAttribute( "CN", "test" );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -83,7 +83,7 @@ public class EntryAttributeSerialization
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        Attribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultAttribute();
         attribute2.readExternal( in );
 
         assertEquals( attribute1, attribute2 );
@@ -93,7 +93,7 @@ public class EntryAttributeSerialization
     @Test
     public void testEntryAttributeManyStringValuesSerialization() throws IOException, ClassNotFoundException
     {
-        Attribute attribute1 = new DefaultEntryAttribute( "CN", "test1", "test2", "test3" );
+        Attribute attribute1 = new DefaultAttribute( "CN", "test1", "test2", "test3" );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -105,7 +105,7 @@ public class EntryAttributeSerialization
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        Attribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultAttribute();
         attribute2.readExternal( in );
 
         assertEquals( attribute1, attribute2 );
@@ -115,7 +115,7 @@ public class EntryAttributeSerialization
     @Test
     public void testEntryAttributeNoBinaryValueSerialization() throws IOException, ClassNotFoundException
     {
-        Attribute attribute1 = new DefaultEntryAttribute( "UserCertificate" );
+        Attribute attribute1 = new DefaultAttribute( "UserCertificate" );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -127,7 +127,7 @@ public class EntryAttributeSerialization
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        Attribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultAttribute();
         attribute2.readExternal( in );
 
         assertEquals( attribute1, attribute2 );
@@ -137,7 +137,7 @@ public class EntryAttributeSerialization
     @Test
     public void testEntryAttributeOneBinaryValueSerialization() throws IOException, ClassNotFoundException
     {
-        Attribute attribute1 = new DefaultEntryAttribute( "UserCertificate", data1 );
+        Attribute attribute1 = new DefaultAttribute( "UserCertificate", data1 );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -149,7 +149,7 @@ public class EntryAttributeSerialization
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        Attribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultAttribute();
         attribute2.readExternal( in );
 
         assertEquals( attribute1, attribute2 );
@@ -159,7 +159,7 @@ public class EntryAttributeSerialization
     @Test
     public void testEntryAttributeManyBinaryValuesSerialization() throws IOException, ClassNotFoundException
     {
-        Attribute attribute1 = new DefaultEntryAttribute( "UserCertificate", data1, data2, data3 );
+        Attribute attribute1 = new DefaultAttribute( "UserCertificate", data1, data2, data3 );
         
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -171,7 +171,7 @@ public class EntryAttributeSerialization
         byte[] data = baos.toByteArray();
         in = new ObjectInputStream( new ByteArrayInputStream( data ) );
 
-        Attribute attribute2 = new DefaultEntryAttribute();
+        Attribute attribute2 = new DefaultAttribute();
         attribute2.readExternal( in );
 
         assertEquals( attribute1, attribute2 );

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java Fri Apr  1 00:05:17 2011
@@ -124,7 +124,7 @@ public class ModificationTest
     @Test 
     public void testCreateServerModification() throws LdapException
     {
-        Attribute attribute = new DefaultEntryAttribute( "cn" );
+        Attribute attribute = new DefaultAttribute( "cn" );
         attribute.add( "test1", "test2" );
         
         Modification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -146,7 +146,7 @@ public class ModificationTest
     @Test
     public void testSerializationModificationADD() throws ClassNotFoundException, IOException, LdapException
     {
-        Attribute attribute = new DefaultEntryAttribute( "cn" );
+        Attribute attribute = new DefaultAttribute( "cn" );
         attribute.add( "test1", "test2" );
         
         DefaultModification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -160,7 +160,7 @@ public class ModificationTest
     @Test
     public void testSerializationModificationREPLACE() throws ClassNotFoundException, IOException, LdapException
     {
-        Attribute attribute = new DefaultEntryAttribute( "cn" );
+        Attribute attribute = new DefaultAttribute( "cn" );
         attribute.add( "test1", "test2" );
         
         DefaultModification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -174,7 +174,7 @@ public class ModificationTest
     @Test
     public void testSerializationModificationREMOVE() throws ClassNotFoundException, IOException, LdapException
     {
-        Attribute attribute = new DefaultEntryAttribute( "cn" );
+        Attribute attribute = new DefaultAttribute( "cn" );
         attribute.add( "test1", "test2" );
         
         DefaultModification mod = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java Fri Apr  1 00:05:17 2011
@@ -35,7 +35,7 @@ import javax.naming.directory.BasicAttri
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.entry.*;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -102,7 +102,7 @@ public class LdifRevertorTest
         
         Entry deletedEntry = new DefaultEntry( dn );
         
-        Attribute oc = new DefaultEntryAttribute( "objectClass" );
+        Attribute oc = new DefaultAttribute( "objectClass" );
         oc.add( "top", "person" );
         
         deletedEntry.put( oc );
@@ -129,7 +129,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
         
-        Attribute ou = new DefaultEntryAttribute( "ou" );
+        Attribute ou = new DefaultAttribute( "ou" );
         ou.add( "apache", "acme corp" );
         modifiedEntry.put( ou );
 
@@ -137,7 +137,7 @@ public class LdifRevertorTest
 
         Modification mod = new DefaultModification( 
             ModificationOperation.REMOVE_ATTRIBUTE, 
-            new DefaultEntryAttribute( "ou", "acme corp" ) );
+            new DefaultAttribute( "ou", "acme corp" ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );
@@ -173,7 +173,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
         
-        Attribute ou = new DefaultEntryAttribute( "ou" );
+        Attribute ou = new DefaultAttribute( "ou" );
         ou.add( "apache", "acme corp" );
         modifiedEntry.put( ou );
 
@@ -181,7 +181,7 @@ public class LdifRevertorTest
 
         Modification mod = new DefaultModification(
             ModificationOperation.REMOVE_ATTRIBUTE, 
-            new DefaultEntryAttribute( "ou" ) );
+            new DefaultAttribute( "ou" ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );
@@ -218,7 +218,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
 
-        Attribute ou = new DefaultEntryAttribute( "ou", "apache", "acme corp" );
+        Attribute ou = new DefaultAttribute( "ou", "apache", "acme corp" );
         modifiedEntry.put( ou );
         
         Dn dn = new Dn( "cn=test, ou=system" );
@@ -261,13 +261,13 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
         
-        Attribute ou = new DefaultEntryAttribute( "ou" );
+        Attribute ou = new DefaultAttribute( "ou" );
         ou.add( "apache", "acme corp" );
         modifiedEntry.put( ou );
 
         Dn dn = new Dn( "cn=test, ou=system" );
 
-        Attribute ouModified = new DefaultEntryAttribute( "ou" );
+        Attribute ouModified = new DefaultAttribute( "ou" );
         ouModified.add( "directory" );
         ouModified.add( "BigCompany inc." );
         
@@ -310,7 +310,7 @@ public class LdifRevertorTest
         
         Dn dn = new Dn( "cn=test, ou=system" );
         
-        Attribute newOu = new DefaultEntryAttribute( "ou" );
+        Attribute newOu = new DefaultAttribute( "ou" );
         newOu.add( "apache" );
         newOu.add( "acme corp" );
 
@@ -352,7 +352,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
 
-        Attribute ou = new DefaultEntryAttribute( "ou" );
+        Attribute ou = new DefaultAttribute( "ou" );
         ou.add( "apache" );
         ou.add( "acme corp" );
         modifiedEntry.put( ou );
@@ -360,7 +360,7 @@ public class LdifRevertorTest
         Dn dn = new Dn( "cn=test, ou=system" );
         
         Modification mod = new DefaultModification( 
-            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "ou" ) );
+            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute( "ou" ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );
@@ -490,27 +490,27 @@ public class LdifRevertorTest
         // First, inject the 'ou'
         
         Modification mod = new DefaultModification( 
-            ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
+            ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute( "ou", "BigCompany inc." ) );
         modifications.add( mod );
 
         // Remove the 'l'
         mod = new DefaultModification(
-            ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute( "l" ) );
+            ModificationOperation.REMOVE_ATTRIBUTE, new DefaultAttribute( "l" ) );
         modifications.add( mod );
         
         // Add 'l=FR'
         mod = new DefaultModification(
-            ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "l", "FR" ) );
+            ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute( "l", "FR" ) );
         modifications.add( mod );
 
         // Replace it with 'l=USA'
         mod = new DefaultModification( 
-            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "l", "USA" ) );
+            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute( "l", "USA" ) );
         modifications.add( mod );
 
         // Replace the ou value
         mod = new DefaultModification( 
-            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "ou", "apache" ) );
+            ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute( "ou", "apache" ) );
         modifications.add( mod );
         
         LdifEntry reversedEntry = LdifRevertor.reverseModify( dn, modifications, initialEntry.getEntry() );
@@ -555,7 +555,7 @@ public class LdifRevertorTest
     {
         Entry modifiedEntry = buildEntry();
 
-        Attribute ou = new DefaultEntryAttribute( "ou" );
+        Attribute ou = new DefaultAttribute( "ou" );
         ou.add( "apache" );
         ou.add( "acme corp" );
         modifiedEntry.put( ou );
@@ -563,7 +563,7 @@ public class LdifRevertorTest
         Dn dn = new Dn( "cn=test, ou=system" );
         Modification mod = new DefaultModification(
             ModificationOperation.ADD_ATTRIBUTE,
-            new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
+            new DefaultAttribute( "ou", "BigCompany inc." ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );
@@ -600,7 +600,7 @@ public class LdifRevertorTest
         Dn dn = new Dn( "cn=test, ou=system" );
         Modification mod = new DefaultModification(
             ModificationOperation.ADD_ATTRIBUTE, 
-            new DefaultEntryAttribute( "ou", "BigCompany inc." ) );
+            new DefaultAttribute( "ou", "BigCompany inc." ) );
 
         LdifEntry reversed = LdifRevertor.reverseModify( dn,
                 Collections.<Modification>singletonList( mod ), modifiedEntry );

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java Fri Apr  1 00:05:17 2011
@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -61,7 +61,7 @@ public class AddRequestImplTest
      */
     private Attribute getAttribute( String id ) throws LdapException
     {
-        Attribute attr = new DefaultEntryAttribute( id );
+        Attribute attr = new DefaultAttribute( id );
         attr.add( "value0" );
         attr.add( "value1" );
         attr.add( "value2" );

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java Fri Apr  1 00:05:17 2011
@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -76,19 +76,19 @@ public class ModifyRequestImplTest
             // do nothing
         }
 
-        Attribute attr = new DefaultEntryAttribute( "attr0" );
+        Attribute attr = new DefaultAttribute( "attr0" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
         Modification item = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
         req.addModification( item );
 
-        attr = new DefaultEntryAttribute( "attr1" );
+        attr = new DefaultAttribute( "attr1" );
         attr.add( "val3" );
         item = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
         req.addModification( item );
 
-        attr = new DefaultEntryAttribute( "attr2" );
+        attr = new DefaultAttribute( "attr2" );
         attr.add( "val4" );
         attr.add( "val5" );
         item = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
@@ -185,7 +185,7 @@ public class ModifyRequestImplTest
     public void testNotEqualDiffModOps() throws LdapException
     {
         ModifyRequestImpl req0 = getRequest();
-        Attribute attr = new DefaultEntryAttribute( "attr3" );
+        Attribute attr = new DefaultAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -193,7 +193,7 @@ public class ModifyRequestImplTest
         req0.addModification( item );
 
         ModifyRequestImpl req1 = getRequest();
-        attr = new DefaultEntryAttribute( "attr3" );
+        attr = new DefaultAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -212,7 +212,7 @@ public class ModifyRequestImplTest
     public void testNotEqualDiffModCount() throws LdapException
     {
         ModifyRequestImpl req0 = getRequest();
-        Attribute attr = new DefaultEntryAttribute( "attr3" );
+        Attribute attr = new DefaultAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -233,7 +233,7 @@ public class ModifyRequestImplTest
     public void testNotEqualDiffModIds() throws LdapException
     {
         ModifyRequestImpl req0 = getRequest();
-        Attribute attr = new DefaultEntryAttribute( "attr3" );
+        Attribute attr = new DefaultAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -241,7 +241,7 @@ public class ModifyRequestImplTest
         req0.addModification( item );
 
         ModifyRequestImpl req1 = getRequest();
-        attr = new DefaultEntryAttribute( "attr4" );
+        attr = new DefaultAttribute( "attr4" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -260,7 +260,7 @@ public class ModifyRequestImplTest
     public void testNotEqualDiffModValues() throws LdapException
     {
         ModifyRequestImpl req0 = getRequest();
-        Attribute attr = new DefaultEntryAttribute( "attr3" );
+        Attribute attr = new DefaultAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -268,7 +268,7 @@ public class ModifyRequestImplTest
         req0.addModification( item );
 
         ModifyRequestImpl req1 = getRequest();
-        attr = new DefaultEntryAttribute( "attr3" );
+        attr = new DefaultAttribute( "attr3" );
         attr.add( "val0" );
         attr.add( "val1" );
         attr.add( "val2" );
@@ -295,19 +295,19 @@ public class ModifyRequestImplTest
                 
                 try
                 { 
-                    Attribute attr = new DefaultEntryAttribute( "attr0" );
+                    Attribute attr = new DefaultAttribute( "attr0" );
                     attr.add( "val0" );
                     attr.add( "val1" );
                     attr.add( "val2" );
                     Modification item = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
                     list.add( item );
     
-                    attr = new DefaultEntryAttribute( "attr1" );
+                    attr = new DefaultAttribute( "attr1" );
                     attr.add( "val3" );
                     item = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
                     list.add( item );
     
-                    attr = new DefaultEntryAttribute( "attr2" );
+                    attr = new DefaultAttribute( "attr2" );
                     attr.add( "val4" );
                     attr.add( "val5" );
                     item = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java Fri Apr  1 00:05:17 2011
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -54,7 +54,7 @@ public class SearchResultEntryImplTest
      */
     private Attribute getEntry( String id ) throws LdapException
     {
-        Attribute attr = new DefaultEntryAttribute( id );
+        Attribute attr = new DefaultAttribute( id );
         attr.add( "value0" );
         attr.add( "value1" );
         attr.add( "value2" );

Modified: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java Fri Apr  1 00:05:17 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.conv
 
 
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -171,7 +171,7 @@ public abstract class SchemaElementImpl 
         else
         {
             Entry entry = new DefaultEntry();
-            Attribute attribute = new DefaultEntryAttribute( "m-name" );
+            Attribute attribute = new DefaultAttribute( "m-name" );
 
             for ( String name : names )
             {
@@ -198,7 +198,7 @@ public abstract class SchemaElementImpl 
         else
         {
             Entry entry = new DefaultEntry();
-            Attribute attribute = new DefaultEntryAttribute( "m-description", description );
+            Attribute attribute = new DefaultAttribute( "m-description", description );
 
             entry.put( attribute );
 
@@ -230,7 +230,7 @@ public abstract class SchemaElementImpl 
         StringBuilder sb = new StringBuilder();
 
         Entry entry = new DefaultEntry();
-        Attribute attribute = new DefaultEntryAttribute( id );
+        Attribute attribute = new DefaultAttribute( id );
 
         for ( String extension : extensions.keySet() )
         {

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Fri Apr  1 00:05:17 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -1043,7 +1043,7 @@ public class SchemaEntityFactory impleme
         }
 
         byte[] bytecode = Base64.decode( byteCodeString.toCharArray() );
-        Attribute attr = new DefaultEntryAttribute( MetaSchemaConstants.M_BYTECODE_AT, bytecode );
+        Attribute attr = new DefaultAttribute( MetaSchemaConstants.M_BYTECODE_AT, bytecode );
 
         return attr;
     }



Mime
View raw message