You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/04/01 02:09:03 UTC
svn commit: r1087516 [1/3] - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/entry/
core-api/src/main/java/org/apache/directory/server/core/schema/
core-api/src/test/java/org/apache/directory/server/core/entry/ cor...
Author: elecharny
Date: Fri Apr 1 00:09:01 2011
New Revision: 1087516
URL: http://svn.apache.org/viewvc?rev=1087516&view=rev
Log:
o Renamed the DefaultEntryAttribute interface to DefaultAttribute
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java
directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Fri Apr 1 00:09:01 2011
@@ -38,7 +38,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.Attribute;
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.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -134,7 +134,7 @@ public class ServerEntryUtils
try
{
- Attribute serverAttribute = new DefaultEntryAttribute( attributeType );
+ Attribute serverAttribute = new DefaultAttribute( attributeType );
for ( NamingEnumeration<?> values = attribute.getAll(); values.hasMoreElements(); )
{
@@ -286,7 +286,7 @@ public class ServerEntryUtils
break;
case ADD_ATTRIBUTE :
- Attribute combined = new DefaultEntryAttribute( id, attributeType );
+ Attribute combined = new DefaultAttribute( id, attributeType );
Attribute toBeAdded = mod.getAttribute();
Attribute existing = entry.get( id );
@@ -437,7 +437,7 @@ public class ServerEntryUtils
{
Modification serverModification = new DefaultModification(
modification.getOperation(),
- new DefaultEntryAttribute( attributeType, modification.getAttribute() ) );
+ new DefaultAttribute( attributeType, modification.getAttribute() ) );
return serverModification;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Fri Apr 1 00:09:01 2011
@@ -47,7 +47,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.schema.registries.synchronizers.RegistrySynchronizerAdaptor;
import org.apache.directory.server.i18n.I18n;
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.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -460,11 +460,11 @@ public final class SchemaPartition exten
List<Modification> mods = new ArrayList<Modification>( 2 );
- mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+ mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT, schemaManager
.lookupAttributeTypeRegistry( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT ), modifyTimestamp ) ) );
- mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+ mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT, schemaManager
.lookupAttributeTypeRegistry( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT ), modifiersName ) ) );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Fri Apr 1 00:09:01 2011
@@ -39,7 +39,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.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.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -585,14 +585,14 @@ public class SchemaPartitionDaoImpl impl
return;
}
- mods.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute(
+ mods.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultAttribute(
MetaSchemaConstants.M_DISABLED_AT, schemaManager.getAttributeType( MetaSchemaConstants.M_DISABLED_AT ) ) ) );
- mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
+ mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute(
SchemaConstants.MODIFIERS_NAME_AT, schemaManager.getAttributeType( SchemaConstants.MODIFIERS_NAME_AT ),
ServerDNConstants.ADMIN_SYSTEM_DN ) ) );
- mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
+ mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute(
SchemaConstants.MODIFY_TIMESTAMP_AT, schemaManager.getAttributeType( SchemaConstants.MODIFY_TIMESTAMP_AT ), DateUtils
.getGeneralizedTime() ) ) );
Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java Fri Apr 1 00:09:01 2011
@@ -43,7 +43,7 @@ import javax.naming.directory.InvalidAtt
import org.apache.commons.io.FileUtils;
import org.apache.directory.shared.ldap.model.entry.BinaryValue;
-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.Attribute;
import org.apache.directory.shared.ldap.model.entry.StringValue;
import org.apache.directory.shared.ldap.model.entry.Value;
@@ -160,7 +160,7 @@ public class SchemaAwareEntryAttributeTe
/**
* Serialize a DefaultEntryAttribute
*/
- private ByteArrayOutputStream serializeValue( DefaultEntryAttribute value ) throws IOException
+ private ByteArrayOutputStream serializeValue( DefaultAttribute value ) throws IOException
{
ObjectOutputStream oOut = null;
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -197,7 +197,7 @@ public class SchemaAwareEntryAttributeTe
/**
* Deserialize a DefaultEntryAttribute
*/
- private DefaultEntryAttribute deserializeValue( ByteArrayOutputStream out, AttributeType at ) throws IOException,
+ private DefaultAttribute deserializeValue( ByteArrayOutputStream out, AttributeType at ) throws IOException,
ClassNotFoundException
{
ObjectInputStream oIn = null;
@@ -207,7 +207,7 @@ public class SchemaAwareEntryAttributeTe
{
oIn = new ObjectInputStream( in );
- DefaultEntryAttribute value = new DefaultEntryAttribute( at );
+ DefaultAttribute value = new DefaultAttribute( at );
value.readExternal( oIn );
return value;
@@ -238,7 +238,7 @@ public class SchemaAwareEntryAttributeTe
{
AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
- DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
+ DefaultAttribute attr = new DefaultAttribute( at );
// Add a String value
attr.add( "test" );
@@ -288,7 +288,7 @@ public class SchemaAwareEntryAttributeTe
{
AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
- DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
+ DefaultAttribute attr = new DefaultAttribute( at );
// Add String values
attr.add( "test" );
@@ -323,7 +323,7 @@ public class SchemaAwareEntryAttributeTe
{
AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
- DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
+ DefaultAttribute attr = new DefaultAttribute( at );
// Add a null value
attr.add( new StringValue( at, null ) );
@@ -344,7 +344,7 @@ public class SchemaAwareEntryAttributeTe
{
AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
- DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
+ DefaultAttribute attr = new DefaultAttribute( at );
attr.add( "Test1" );
attr.add( "Test2" );
@@ -366,7 +366,7 @@ public class SchemaAwareEntryAttributeTe
{
AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
- DefaultEntryAttribute attr = new DefaultEntryAttribute( at );
+ DefaultAttribute attr = new DefaultAttribute( at );
attr.add( "Test 1" );
attr.add( "Test 2" );
@@ -384,17 +384,17 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testGetBytes() throws LdapInvalidAttributeValueException
{
- Attribute attr1 = new DefaultEntryAttribute( atPwd );
+ Attribute attr1 = new DefaultAttribute( atPwd );
attr1.add( ( byte[] ) null );
assertNull( attr1.getBytes() );
- Attribute attr2 = new DefaultEntryAttribute( atPwd );
+ Attribute attr2 = new DefaultAttribute( atPwd );
attr2.add( BYTES1, BYTES2 );
assertTrue( Arrays.equals( BYTES1, attr2.getBytes() ) );
- Attribute attr3 = new DefaultEntryAttribute( atCN );
+ Attribute attr3 = new DefaultAttribute( atCN );
attr3.add( "a", "b" );
@@ -416,7 +416,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testGetId()
{
- Attribute attr = new DefaultEntryAttribute( atCN );
+ Attribute attr = new DefaultAttribute( atCN );
assertEquals( "2.5.4.3", attr.getId() );
@@ -439,16 +439,16 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testGetString() throws LdapInvalidAttributeValueException
{
- Attribute attr1 = new DefaultEntryAttribute( atDC );
+ Attribute attr1 = new DefaultAttribute( atDC );
assertEquals( 1, attr1.add( ( String ) null ) );
- Attribute attr2 = new DefaultEntryAttribute( atDC );
+ Attribute attr2 = new DefaultAttribute( atDC );
attr2.add( "a" );
assertEquals( "a", attr2.getString() );
- Attribute attr3 = new DefaultEntryAttribute( atPwd );
+ Attribute attr3 = new DefaultAttribute( atPwd );
attr3.add( BYTES1, BYTES2 );
@@ -470,7 +470,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testGetUpId()
{
- Attribute attr = new DefaultEntryAttribute( atCN );
+ Attribute attr = new DefaultAttribute( atCN );
assertNotNull( attr.getUpId() );
assertEquals( "cn", attr.getUpId() );
@@ -492,8 +492,8 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testHashCode() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( atDC );
- Attribute attr2 = new DefaultEntryAttribute( atSN );
+ Attribute attr1 = new DefaultAttribute( atDC );
+ Attribute attr2 = new DefaultAttribute( atSN );
assertNotSame( attr1.hashCode(), attr2.hashCode() );
attr2.apply( atDC );
@@ -516,8 +516,8 @@ public class SchemaAwareEntryAttributeTe
attr2.add( "b", "a" );
assertNotSame( attr1.hashCode(), attr2.hashCode() );
- Attribute attr3 = new DefaultEntryAttribute( atPwd );
- Attribute attr4 = new DefaultEntryAttribute( atPwd );
+ Attribute attr3 = new DefaultAttribute( atPwd );
+ Attribute attr4 = new DefaultAttribute( atPwd );
assertNotSame( attr3.hashCode(), attr4.hashCode() );
attr3.add( ( byte[] ) null );
@@ -551,7 +551,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testSetId()
{
- Attribute attr = new DefaultEntryAttribute( atCN );
+ Attribute attr = new DefaultAttribute( atCN );
attr.setUpId( "Cn" );
assertEquals( "2.5.4.3", attr.getId() );
@@ -599,7 +599,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testIsValid() throws Exception
{
- Attribute attr = new DefaultEntryAttribute( atCN );
+ Attribute attr = new DefaultAttribute( atCN );
// No value, this should not be valid
assertFalse( attr.isValid( atCN.getEquality().getSyntax().getSyntaxChecker() ) );
@@ -630,21 +630,21 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testAddValueArray() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( atDC );
+ Attribute attr1 = new DefaultAttribute( atDC );
int nbAdded = attr1.add( (String)null );
assertEquals( 1, nbAdded );
assertTrue( attr1.isHumanReadable() );
assertEquals( NULL_STRING_VALUE, attr1.get() );
- Attribute attr2 = new DefaultEntryAttribute( atPwd );
+ Attribute attr2 = new DefaultAttribute( atPwd );
nbAdded = attr2.add( new BinaryValue( atPwd, null ) );
assertEquals( 1, nbAdded );
assertFalse( attr2.isHumanReadable() );
assertEquals( NULL_BINARY_VALUE, attr2.get() );
- Attribute attr3 = new DefaultEntryAttribute( atCN );
+ Attribute attr3 = new DefaultAttribute( atCN );
nbAdded = attr3.add( new StringValue( atCN, "a" ), new StringValue( atCN, "b" ) );
assertEquals( 2, nbAdded );
@@ -652,7 +652,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr3.contains( "a" ) );
assertTrue( attr3.contains( "b" ) );
- Attribute attr4 = new DefaultEntryAttribute( atCN );
+ Attribute attr4 = new DefaultAttribute( atCN );
nbAdded = attr4.add( new BinaryValue( atPwd, BYTES1 ), new BinaryValue( atPwd, BYTES2 ) );
assertEquals( 0, nbAdded );
@@ -660,7 +660,7 @@ public class SchemaAwareEntryAttributeTe
assertFalse( attr4.contains( BYTES1 ) );
assertFalse( attr4.contains( BYTES2 ) );
- Attribute attr5 = new DefaultEntryAttribute( atCN );
+ Attribute attr5 = new DefaultAttribute( atCN );
nbAdded = attr5.add( new StringValue( atCN, "c" ), new BinaryValue( atPwd, BYTES1 ) );
assertEquals( 1, nbAdded );
@@ -668,7 +668,7 @@ public class SchemaAwareEntryAttributeTe
assertFalse( attr5.contains( "ab" ) );
assertTrue( attr5.contains( "c" ) );
- Attribute attr6 = new DefaultEntryAttribute( atPwd );
+ Attribute attr6 = new DefaultAttribute( atPwd );
nbAdded = attr6.add( new BinaryValue( atPwd, BYTES1 ), new StringValue( atCN, "c" ) );
assertEquals( 1, nbAdded );
@@ -676,7 +676,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr6.contains( BYTES1 ) );
assertFalse( attr6.contains( BYTES3 ) );
- Attribute attr7 = new DefaultEntryAttribute( atPwd );
+ Attribute attr7 = new DefaultAttribute( atPwd );
nbAdded = attr7.add( new BinaryValue( atPwd, null ), new StringValue( atCN, "c" ) );
assertEquals( 1, nbAdded );
@@ -684,7 +684,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr7.contains( NULL_BINARY_VALUE ) );
assertFalse( attr7.contains( BYTES3 ) );
- Attribute attr8 = new DefaultEntryAttribute( atDC );
+ Attribute attr8 = new DefaultAttribute( atDC );
nbAdded = attr8.add( new StringValue( atDC, null ), new BinaryValue( atPwd, BYTES1 ) );
assertEquals( 1, nbAdded );
@@ -692,7 +692,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr8.contains( NULL_STRING_VALUE ) );
assertFalse( attr8.contains( "ab" ) );
- Attribute attr9 = new DefaultEntryAttribute( atDC );
+ Attribute attr9 = new DefaultAttribute( atDC );
nbAdded = attr9.add( new StringValue( ( String ) null ), new StringValue( "ab" ) );
assertEquals( 2, nbAdded );
@@ -700,7 +700,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr9.contains( NULL_STRING_VALUE ) );
assertTrue( attr9.contains( "ab" ) );
- Attribute attr10 = new DefaultEntryAttribute( atPwd );
+ Attribute attr10 = new DefaultAttribute( atPwd );
nbAdded = attr10.add( new BinaryValue( ( byte[] ) null ), new BinaryValue( BYTES1 ) );
assertEquals( 2, nbAdded );
@@ -716,28 +716,28 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testAddStringArray() throws LdapInvalidAttributeValueException
{
- Attribute attr1 = new DefaultEntryAttribute( atDC );
+ Attribute attr1 = new DefaultAttribute( atDC );
int nbAdded = attr1.add( ( String ) null );
assertEquals( 1, nbAdded );
assertTrue( attr1.isHumanReadable() );
assertEquals( NULL_STRING_VALUE, attr1.get() );
- Attribute attr2 = new DefaultEntryAttribute( atDC );
+ Attribute attr2 = new DefaultAttribute( atDC );
nbAdded = attr2.add( "" );
assertEquals( 1, nbAdded );
assertTrue( attr2.isHumanReadable() );
assertEquals( "", attr2.getString() );
- Attribute attr3 = new DefaultEntryAttribute( atCN );
+ Attribute attr3 = new DefaultAttribute( atCN );
nbAdded = attr3.add( "t" );
assertEquals( 1, nbAdded );
assertTrue( attr3.isHumanReadable() );
assertEquals( "t", attr3.getString() );
- Attribute attr4 = new DefaultEntryAttribute( atCN );
+ Attribute attr4 = new DefaultAttribute( atCN );
nbAdded = attr4.add( "a", "b", "c", "d" );
assertEquals( 4, nbAdded );
@@ -769,7 +769,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr4.contains( "e" ) );
assertFalse( attr4.contains( "ab" ) );
- Attribute attr5 = new DefaultEntryAttribute( atEMail );
+ Attribute attr5 = new DefaultAttribute( atEMail );
nbAdded = attr5.add( "a", "b", ( String ) null, "d" );
assertEquals( 4, nbAdded );
@@ -779,7 +779,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr5.contains( NULL_STRING_VALUE ) );
assertTrue( attr5.contains( "d" ) );
- Attribute attr6 = new DefaultEntryAttribute( atPwd );
+ Attribute attr6 = new DefaultAttribute( atPwd );
nbAdded = attr6.add( "a", ( String ) null );
assertEquals( 2, nbAdded );
@@ -793,28 +793,28 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testAddByteArray() throws LdapInvalidAttributeValueException
{
- Attribute attr1 = new DefaultEntryAttribute( atPwd );
+ Attribute attr1 = new DefaultAttribute( atPwd );
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( atPwd );
+ Attribute attr2 = new DefaultAttribute( atPwd );
nbAdded = attr2.add( StringConstants.EMPTY_BYTES );
assertEquals( 1, nbAdded );
assertFalse( attr2.isHumanReadable() );
assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, attr2.getBytes() ) );
- Attribute attr3 = new DefaultEntryAttribute( atPwd );
+ Attribute attr3 = new DefaultAttribute( atPwd );
nbAdded = attr3.add( BYTES1 );
assertEquals( 1, nbAdded );
assertFalse( attr3.isHumanReadable() );
assertTrue( Arrays.equals( BYTES1, attr3.getBytes() ) );
- Attribute attr4 = new DefaultEntryAttribute( atPwd );
+ Attribute attr4 = new DefaultAttribute( atPwd );
nbAdded = attr4.add( BYTES1, BYTES2, BYTES3, BYTES4 );
assertEquals( 4, nbAdded );
@@ -824,7 +824,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr4.contains( BYTES3 ) );
assertTrue( attr4.contains( BYTES4 ) );
- Attribute attr5 = new DefaultEntryAttribute( atPwd );
+ Attribute attr5 = new DefaultAttribute( atPwd );
nbAdded = attr5.add( BYTES1, BYTES2, ( byte[] ) null, BYTES3 );
assertEquals( 4, nbAdded );
@@ -834,7 +834,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr5.contains( ( byte[] ) null ) );
assertTrue( attr5.contains( BYTES3 ) );
- Attribute attr6 = new DefaultEntryAttribute( atPwd );
+ Attribute attr6 = new DefaultAttribute( atPwd );
nbAdded = attr6.add( "ab", ( String ) null );
assertEquals( 2, nbAdded );
@@ -848,7 +848,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testClear() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute( "email", atEMail );
+ Attribute attr = new DefaultAttribute( "email", atEMail );
assertEquals( 0, attr.size() );
@@ -868,7 +868,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testContainsValueArray() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( atEMail );
+ Attribute attr1 = new DefaultAttribute( atEMail );
assertEquals( 0, attr1.size() );
assertFalse( attr1.contains( STR_VALUE1 ) );
@@ -891,7 +891,7 @@ public class SchemaAwareEntryAttributeTe
assertFalse( attr1.contains( STR_VALUE4 ) );
assertFalse( attr1.contains( NULL_STRING_VALUE ) );
- Attribute attr2 = new DefaultEntryAttribute( atPwd );
+ Attribute attr2 = new DefaultAttribute( atPwd );
assertEquals( 0, attr2.size() );
assertFalse( attr2.contains( BYTES1 ) );
assertFalse( attr2.contains( NULL_BINARY_VALUE ) );
@@ -919,7 +919,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testContainsStringArray() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( atEMail );
+ Attribute attr1 = new DefaultAttribute( atEMail );
assertEquals( 0, attr1.size() );
assertFalse( attr1.contains( "a" ) );
@@ -949,7 +949,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testContainsByteArray() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( atPwd );
+ Attribute attr1 = new DefaultAttribute( atPwd );
assertEquals( 0, attr1.size() );
assertFalse( attr1.contains( BYTES1 ) );
@@ -979,11 +979,11 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testEquals() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( atCN );
+ Attribute attr1 = new DefaultAttribute( atCN );
assertFalse( attr1.equals( null ) );
- Attribute attr2 = new DefaultEntryAttribute( atCN );
+ Attribute attr2 = new DefaultAttribute( atCN );
assertTrue( attr1.equals( attr2 ) );
@@ -1002,30 +1002,30 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr1.equals( attr2 ) );
- Attribute attr3 = new DefaultEntryAttribute( atPwd );
- Attribute attr4 = new DefaultEntryAttribute( atPwd );
+ Attribute attr3 = new DefaultAttribute( atPwd );
+ Attribute attr4 = new DefaultAttribute( atPwd );
attr3.add( NULL_BINARY_VALUE );
attr4.add( NULL_BINARY_VALUE );
assertTrue( attr3.equals( attr4 ) );
- Attribute attr5 = new DefaultEntryAttribute( atPwd );
- Attribute attr6 = new DefaultEntryAttribute( atDC );
+ Attribute attr5 = new DefaultAttribute( atPwd );
+ Attribute attr6 = new DefaultAttribute( atDC );
assertFalse( attr5.equals( attr6 ) );
attr5.add( NULL_BINARY_VALUE );
attr6.add( NULL_STRING_VALUE );
assertFalse( attr5.equals( attr6 ) );
- Attribute attr7 = new DefaultEntryAttribute( atCN );
- Attribute attr8 = new DefaultEntryAttribute( atPwd );
+ Attribute attr7 = new DefaultAttribute( atCN );
+ Attribute attr8 = new DefaultAttribute( atPwd );
attr7.add( "a" );
attr8.add( BYTES2 );
assertFalse( attr7.equals( attr8 ) );
- Attribute attr9 = new DefaultEntryAttribute( atCN );
- Attribute attr10 = new DefaultEntryAttribute( atPwd );
+ Attribute attr9 = new DefaultAttribute( atCN );
+ Attribute attr10 = new DefaultAttribute( atPwd );
attr9.add( "a" );
attr9.add( BYTES2 );
@@ -1040,12 +1040,12 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testGet() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( "dc", atDC );
+ Attribute attr1 = new DefaultAttribute( "dc", atDC );
attr1.add( ( String ) null );
assertEquals( NULL_STRING_VALUE, attr1.get() );
- Attribute attr2 = new DefaultEntryAttribute( "email", atEMail );
+ Attribute attr2 = new DefaultAttribute( "email", atEMail );
attr2.add( "a", "b", "c" );
assertEquals( "a", attr2.get().getString() );
@@ -1059,7 +1059,7 @@ public class SchemaAwareEntryAttributeTe
attr2.remove( "c" );
assertNull( attr2.get() );
- Attribute attr3 = new DefaultEntryAttribute( "userPassword", atPwd );
+ Attribute attr3 = new DefaultAttribute( "userPassword", atPwd );
attr3.add( BYTES1, BYTES2, BYTES3 );
assertTrue( Arrays.equals( BYTES1, attr3.get().getBytes() ) );
@@ -1081,7 +1081,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testGetAll() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute( atEMail );
+ Attribute attr = new DefaultAttribute( atEMail );
Iterator<Value<?>> iterator = attr.getAll();
assertFalse( iterator.hasNext() );
@@ -1113,14 +1113,14 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testSize() throws Exception
{
- Attribute attr1 = new DefaultEntryAttribute( atDC );
+ Attribute attr1 = new DefaultAttribute( atDC );
assertEquals( 0, attr1.size() );
attr1.add( ( String ) null );
assertEquals( 1, attr1.size() );
- Attribute attr2 = new DefaultEntryAttribute( atCN );
+ Attribute attr2 = new DefaultAttribute( atCN );
attr2.add( "a", "b" );
assertEquals( 2, attr2.size() );
@@ -1128,7 +1128,7 @@ public class SchemaAwareEntryAttributeTe
attr2.clear();
assertEquals( 0, attr2.size() );
- Attribute attr3 = new DefaultEntryAttribute( atC );
+ Attribute attr3 = new DefaultAttribute( atC );
attr3.add( "US" );
assertEquals( 1, attr3.size() );
@@ -1145,28 +1145,28 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testPutByteArray() throws InvalidAttributeValueException, Exception
{
- Attribute attr1 = new DefaultEntryAttribute( atPwd );
+ Attribute attr1 = new DefaultAttribute( atPwd );
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( atPwd );
+ Attribute attr2 = new DefaultAttribute( atPwd );
nbAdded = attr2.add( StringConstants.EMPTY_BYTES );
assertEquals( 1, nbAdded );
assertFalse( attr2.isHumanReadable() );
assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, attr2.getBytes() ) );
- Attribute attr3 = new DefaultEntryAttribute( atPwd );
+ Attribute attr3 = new DefaultAttribute( atPwd );
nbAdded = attr3.add( BYTES1 );
assertEquals( 1, nbAdded );
assertFalse( attr3.isHumanReadable() );
assertTrue( Arrays.equals( BYTES1, attr3.getBytes() ) );
- Attribute attr4 = new DefaultEntryAttribute( atPwd );
+ Attribute attr4 = new DefaultAttribute( atPwd );
nbAdded = attr4.add( BYTES1, BYTES2 );
assertEquals( 2, nbAdded );
@@ -1181,7 +1181,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr4.contains( BYTES3 ) );
assertTrue( attr4.contains( BYTES4 ) );
- Attribute attr5 = new DefaultEntryAttribute( atPwd );
+ Attribute attr5 = new DefaultAttribute( atPwd );
nbAdded = attr5.add( BYTES1, BYTES2, ( byte[] ) null, BYTES3 );
assertEquals( 4, nbAdded );
@@ -1191,7 +1191,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr5.contains( ( byte[] ) null ) );
assertTrue( attr5.contains( BYTES3 ) );
- Attribute attr6 = new DefaultEntryAttribute( atPwd );
+ Attribute attr6 = new DefaultAttribute( atPwd );
assertFalse( attr6.isHumanReadable() );
nbAdded = attr6.add( BYTES1, ( byte[] ) null );
@@ -1207,28 +1207,28 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testPutStringArray() throws LdapInvalidAttributeValueException
{
- Attribute attr1 = new DefaultEntryAttribute( atDC );
+ Attribute attr1 = new DefaultAttribute( atDC );
int nbAdded = attr1.add( ( String ) null );
assertEquals( 1, nbAdded );
assertTrue( attr1.isHumanReadable() );
assertEquals( NULL_STRING_VALUE, attr1.get() );
- Attribute attr2 = new DefaultEntryAttribute( atDC );
+ Attribute attr2 = new DefaultAttribute( atDC );
nbAdded = attr2.add( "" );
assertEquals( 1, nbAdded );
assertTrue( attr2.isHumanReadable() );
assertEquals( "", attr2.getString() );
- Attribute attr3 = new DefaultEntryAttribute( atDC );
+ Attribute attr3 = new DefaultAttribute( atDC );
nbAdded = attr3.add( "t" );
assertEquals( 1, nbAdded );
assertTrue( attr3.isHumanReadable() );
assertEquals( "t", attr3.getString() );
- Attribute attr4 = new DefaultEntryAttribute( atEMail );
+ Attribute attr4 = new DefaultAttribute( atEMail );
nbAdded = attr4.add( "a", "b", "c", "d" );
assertEquals( 4, nbAdded );
@@ -1255,7 +1255,7 @@ public class SchemaAwareEntryAttributeTe
assertEquals( 0, nbAdded );
assertTrue( attr4.isHumanReadable() );
- Attribute attr5 = new DefaultEntryAttribute( atEMail );
+ Attribute attr5 = new DefaultAttribute( atEMail );
nbAdded = attr5.add( "a", "b", ( String ) null, "d" );
assertEquals( 4, nbAdded );
@@ -1265,7 +1265,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr5.contains( NULL_STRING_VALUE ) );
assertTrue( attr5.contains( "d" ) );
- Attribute attr6 = new DefaultEntryAttribute( atPwd );
+ Attribute attr6 = new DefaultAttribute( atPwd );
nbAdded = attr6.add( "a", ( String ) null );
assertEquals( 2, nbAdded );
@@ -1279,7 +1279,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testPutValueArray() throws Exception
{
- Attribute attr1 = new DefaultEntryAttribute( atDC );
+ Attribute attr1 = new DefaultAttribute( atDC );
assertEquals( 0, attr1.size() );
@@ -1308,7 +1308,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr1.contains( NULL_STRING_VALUE ) );
assertFalse( attr1.contains( STR_VALUE3 ) );
- Attribute attr2 = new DefaultEntryAttribute( atPwd );
+ Attribute attr2 = new DefaultAttribute( atPwd );
assertEquals( 0, attr2.size() );
attr2.add( NULL_BINARY_VALUE );
@@ -1337,7 +1337,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testRemoveValueArray() throws Exception
{
- Attribute attr1 = new DefaultEntryAttribute( atEMail );
+ Attribute attr1 = new DefaultAttribute( atEMail );
assertFalse( attr1.remove( STR_VALUE1 ) );
@@ -1366,7 +1366,7 @@ public class SchemaAwareEntryAttributeTe
assertFalse( attr1.remove( NULL_STRING_VALUE, STR_VALUE1, BIN_VALUE3 ) );
assertEquals( 1, attr1.size() );
- Attribute attr2 = new DefaultEntryAttribute( atPwd );
+ Attribute attr2 = new DefaultAttribute( atPwd );
assertFalse( attr2.remove( BIN_VALUE1 ) );
@@ -1404,7 +1404,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testRemoveByteArray() throws Exception
{
- Attribute attr1 = new DefaultEntryAttribute( atPwd );
+ Attribute attr1 = new DefaultAttribute( atPwd );
assertFalse( attr1.remove( BYTES1 ) );
@@ -1435,7 +1435,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testRemoveStringArray() throws Exception
{
- Attribute attr1 = new DefaultEntryAttribute( atEMail );
+ Attribute attr1 = new DefaultAttribute( atEMail );
assertFalse( attr1.remove( "a" ) );
@@ -1458,7 +1458,7 @@ public class SchemaAwareEntryAttributeTe
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 );
@@ -1474,7 +1474,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testIterator() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( atCN );
+ Attribute attr1 = new DefaultAttribute( atCN );
attr1.add( "a", "b", "c" );
Iterator<Value<?>> iter = attr1.iterator();
@@ -1499,7 +1499,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testToString() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute( atEMail );
+ Attribute attr = new DefaultAttribute( atEMail );
assertEquals( " email: (null)\n", attr.toString() );
@@ -1521,7 +1521,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testInstanceOf() throws Exception
{
- Attribute attr = new DefaultEntryAttribute( atCN );
+ Attribute attr = new DefaultAttribute( atCN );
assertTrue( attr.isInstanceOf( atCN ) );
assertTrue( attr.isInstanceOf( atName) );
@@ -1535,7 +1535,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testSetUpIdStringAttributeType() throws Exception
{
- Attribute attr = new DefaultEntryAttribute( atSN );
+ Attribute attr = new DefaultAttribute( atSN );
attr.setUpId( null, atCN );
assertEquals( "2.5.4.3", attr.getId() );
@@ -1591,7 +1591,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testSetUpIdString() throws Exception
{
- Attribute attr = new DefaultEntryAttribute( atCN );
+ Attribute attr = new DefaultAttribute( atCN );
attr.setUpId( "cn" );
assertEquals( "2.5.4.3", attr.getId() );
@@ -1614,7 +1614,7 @@ public class SchemaAwareEntryAttributeTe
assertEquals( atCN, attr.getAttributeType() );
// Now check wrong IDs
- attr = new DefaultEntryAttribute( atCN );
+ attr = new DefaultAttribute( atCN );
try
{
@@ -1680,7 +1680,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testSetAttributeType() throws Exception
{
- Attribute attr = new DefaultEntryAttribute( atCN );
+ Attribute attr = new DefaultAttribute( atCN );
try
{
@@ -1706,7 +1706,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testGetAttributeType() throws Exception
{
- Attribute attr = new DefaultEntryAttribute( atSN );
+ Attribute attr = new DefaultAttribute( atSN );
assertEquals( atSN, attr.getAttributeType() );
}
@@ -1717,7 +1717,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testDefaultServerAttributeAttributeType()
{
- Attribute attr = new DefaultEntryAttribute( atCN );
+ Attribute attr = new DefaultAttribute( atCN );
assertTrue( attr.isHumanReadable() );
assertEquals( 0, attr.size() );
@@ -1733,7 +1733,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testDefaultServerAttributeStringAttributeType()
{
- Attribute attr1 = new DefaultEntryAttribute( "cn", atCN );
+ Attribute attr1 = new DefaultAttribute( "cn", atCN );
assertTrue( attr1.isHumanReadable() );
assertEquals( 0, attr1.size() );
@@ -1741,7 +1741,7 @@ public class SchemaAwareEntryAttributeTe
assertEquals( "cn", attr1.getUpId() );
assertEquals( atCN, attr1.getAttributeType() );
- Attribute attr2 = new DefaultEntryAttribute( " CommonName ", atCN );
+ Attribute attr2 = new DefaultAttribute( " CommonName ", atCN );
assertTrue( attr2.isHumanReadable() );
assertEquals( 0, attr2.size() );
@@ -1749,7 +1749,7 @@ public class SchemaAwareEntryAttributeTe
assertEquals( " CommonName ", attr2.getUpId() );
assertEquals( atCN, attr2.getAttributeType() );
- Attribute attr3 = new DefaultEntryAttribute( " ", atCN );
+ Attribute attr3 = new DefaultAttribute( " ", atCN );
assertTrue( attr3.isHumanReadable() );
assertEquals( 0, attr3.size() );
@@ -1765,7 +1765,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testDefaultServerAttributeAttributeTypeValueArray() throws Exception
{
- Attribute attr1 = new DefaultEntryAttribute( atDC, STR_VALUE1, STR_VALUE2, NULL_STRING_VALUE );
+ Attribute attr1 = new DefaultAttribute( atDC, STR_VALUE1, STR_VALUE2, NULL_STRING_VALUE );
assertTrue( attr1.isHumanReadable() );
assertEquals( 3, attr1.size() );
@@ -1775,7 +1775,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr1.contains( "a", "b" ) );
assertTrue( attr1.contains( NULL_STRING_VALUE ) );
- Attribute attr2 = new DefaultEntryAttribute( atDC, STR_VALUE1, BIN_VALUE2, NULL_STRING_VALUE );
+ Attribute attr2 = new DefaultAttribute( atDC, STR_VALUE1, BIN_VALUE2, NULL_STRING_VALUE );
assertTrue( attr2.isHumanReadable() );
assertEquals( 2, attr2.size() );
@@ -1793,7 +1793,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testDefaultServerAttributeStringAttributeTypeValueArray() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( "dc", atDC, STR_VALUE1, STR_VALUE2, NULL_STRING_VALUE );
+ Attribute attr1 = new DefaultAttribute( "dc", atDC, STR_VALUE1, STR_VALUE2, NULL_STRING_VALUE );
assertTrue( attr1.isHumanReadable() );
assertEquals( 3, attr1.size() );
@@ -1803,7 +1803,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr1.contains( "a", "b" ) );
assertTrue( attr1.contains( NULL_STRING_VALUE ) );
- Attribute attr2 = new DefaultEntryAttribute( atDC, STR_VALUE1, BIN_VALUE2, NULL_STRING_VALUE );
+ Attribute attr2 = new DefaultAttribute( atDC, STR_VALUE1, BIN_VALUE2, NULL_STRING_VALUE );
assertTrue( attr2.isHumanReadable() );
assertEquals( 2, attr2.size() );
@@ -1813,7 +1813,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr2.contains( "a" ) );
assertTrue( attr2.contains( NULL_STRING_VALUE ) );
- Attribute attr3 = new DefaultEntryAttribute( "DomainComponent", atDC, STR_VALUE1, STR_VALUE2,
+ Attribute attr3 = new DefaultAttribute( "DomainComponent", atDC, STR_VALUE1, STR_VALUE2,
NULL_STRING_VALUE );
assertTrue( attr3.isHumanReadable() );
@@ -1824,7 +1824,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr3.contains( "a", "b" ) );
assertTrue( attr3.contains( NULL_STRING_VALUE ) );
- Attribute attr4 = new DefaultEntryAttribute( " 0.9.2342.19200300.100.1.25 ", atDC, STR_VALUE1, STR_VALUE2,
+ Attribute attr4 = new DefaultAttribute( " 0.9.2342.19200300.100.1.25 ", atDC, STR_VALUE1, STR_VALUE2,
NULL_STRING_VALUE );
assertTrue( attr4.isHumanReadable() );
@@ -1843,7 +1843,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testDefaultServerAttributeAttributeTypeStringArray() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( atEMail, "a", "b", ( String ) null );
+ Attribute attr1 = new DefaultAttribute( atEMail, "a", "b", ( String ) null );
assertTrue( attr1.isHumanReadable() );
assertEquals( 3, attr1.size() );
@@ -1853,7 +1853,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr1.contains( "a", "b" ) );
assertTrue( attr1.contains( NULL_STRING_VALUE ) );
- Attribute attr2 = new DefaultEntryAttribute( atEMail, STR_VALUE1, BIN_VALUE2, NULL_STRING_VALUE );
+ Attribute attr2 = new DefaultAttribute( atEMail, STR_VALUE1, BIN_VALUE2, NULL_STRING_VALUE );
assertTrue( attr2.isHumanReadable() );
assertEquals( 2, attr2.size() );
@@ -1871,7 +1871,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testDefaultServerAttributeStringAttributeTypeStringArray() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( "email", atEMail, "a", "b", ( String ) null );
+ Attribute attr1 = new DefaultAttribute( "email", atEMail, "a", "b", ( String ) null );
assertTrue( attr1.isHumanReadable() );
assertEquals( 3, attr1.size() );
@@ -1881,7 +1881,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr1.contains( "a", "b" ) );
assertTrue( attr1.contains( NULL_STRING_VALUE ) );
- Attribute attr2 = new DefaultEntryAttribute( "EMail", atEMail, "a", "b", ( String ) null );
+ Attribute attr2 = new DefaultAttribute( "EMail", atEMail, "a", "b", ( String ) null );
assertTrue( attr2.isHumanReadable() );
assertEquals( 3, attr2.size() );
@@ -1891,7 +1891,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr2.contains( "a", "b" ) );
assertTrue( attr2.contains( NULL_STRING_VALUE ) );
- Attribute attr3 = new DefaultEntryAttribute( " 1.2.840.113549.1.9.1 ", atEMail, "a", "b",
+ Attribute attr3 = new DefaultAttribute( " 1.2.840.113549.1.9.1 ", atEMail, "a", "b",
( String ) null );
assertTrue( attr3.isHumanReadable() );
@@ -1910,7 +1910,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testDefaultServerAttributeAttributeTypeByteArray() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2, ( byte[] ) null );
+ Attribute attr1 = new DefaultAttribute( atPwd, BYTES1, BYTES2, ( byte[] ) null );
assertFalse( attr1.isHumanReadable() );
assertEquals( 3, attr1.size() );
@@ -1920,7 +1920,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr1.contains( BYTES1, BYTES2 ) );
assertTrue( attr1.contains( NULL_BINARY_VALUE ) );
- Attribute attr2 = new DefaultEntryAttribute( atPwd, STR_VALUE1, BIN_VALUE2, NULL_BINARY_VALUE );
+ Attribute attr2 = new DefaultAttribute( atPwd, STR_VALUE1, BIN_VALUE2, NULL_BINARY_VALUE );
assertFalse( attr2.isHumanReadable() );
assertEquals( 2, attr2.size() );
@@ -1938,7 +1938,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testDefaultServerAttributeStringAttributeTypeByteArray() throws LdapException
{
- Attribute attr1 = new DefaultEntryAttribute( "userPassword", atPwd, BYTES1, BYTES2, ( byte[] ) null );
+ Attribute attr1 = new DefaultAttribute( "userPassword", atPwd, BYTES1, BYTES2, ( byte[] ) null );
assertFalse( attr1.isHumanReadable() );
assertEquals( 3, attr1.size() );
@@ -1948,7 +1948,7 @@ public class SchemaAwareEntryAttributeTe
assertTrue( attr1.contains( BYTES1, BYTES2 ) );
assertTrue( attr1.contains( NULL_BINARY_VALUE ) );
- Attribute attr2 = new DefaultEntryAttribute( "2.5.4.35", atPwd, STR_VALUE1, BIN_VALUE2, NULL_BINARY_VALUE );
+ Attribute attr2 = new DefaultAttribute( "2.5.4.35", atPwd, STR_VALUE1, BIN_VALUE2, NULL_BINARY_VALUE );
assertFalse( attr2.isHumanReadable() );
assertEquals( 2, attr2.size() );
@@ -1966,7 +1966,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testClone() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute( atDC );
+ Attribute attr = new DefaultAttribute( atDC );
Attribute clone = attr.clone();
@@ -1992,15 +1992,15 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testCopyConstructorServerAttribute() throws LdapException
{
- Attribute attribute = new DefaultEntryAttribute( atCN );
+ Attribute attribute = new DefaultAttribute( atCN );
- Attribute copy = new DefaultEntryAttribute( atCN, attribute );
+ Attribute copy = new DefaultAttribute( atCN, attribute );
assertEquals( copy, attribute );
- Attribute attribute2 = new DefaultEntryAttribute( atCN, "test" );
+ Attribute attribute2 = new DefaultAttribute( atCN, "test" );
- Attribute copy2 = new DefaultEntryAttribute( atCN, attribute2 );
+ Attribute copy2 = new DefaultAttribute( atCN, attribute2 );
assertEquals( copy2, attribute2 );
attribute2.add( "test2" );
@@ -2015,10 +2015,10 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testCopyConstructorClientAttribute() throws LdapException
{
- Attribute attribute = new DefaultEntryAttribute( "commonName" );
+ Attribute attribute = new DefaultAttribute( "commonName" );
attribute.add( "test" );
- Attribute copy = new DefaultEntryAttribute( atCN, attribute );
+ Attribute copy = new DefaultAttribute( atCN, attribute );
assertEquals( atCN, copy.getAttributeType() );
assertEquals( "test", copy.getString() );
@@ -2035,7 +2035,7 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testToClientAttribute() throws LdapException
{
- Attribute attribute = new DefaultEntryAttribute( atCN, "test", "test2" );
+ Attribute attribute = new DefaultAttribute( atCN, "test", "test2" );
Attribute clientAttribute = attribute.clone();
@@ -2055,11 +2055,11 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testSerializeCompleteAttribute() throws LdapException, IOException, ClassNotFoundException
{
- DefaultEntryAttribute dsa = new DefaultEntryAttribute( atCN );
+ DefaultAttribute dsa = new DefaultAttribute( atCN );
dsa.setUpId( "CommonName" );
dsa.add( "test1", "test2" );
- DefaultEntryAttribute dsaSer = deserializeValue( serializeValue( dsa ), atCN );
+ DefaultAttribute dsaSer = deserializeValue( serializeValue( dsa ), atCN );
assertEquals( dsa.toString(), dsaSer.toString() );
assertEquals( "2.5.4.3", dsaSer.getId() );
assertEquals( "CommonName", dsaSer.getUpId() );
@@ -2075,10 +2075,10 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testSerializeAttributeWithNoValue() throws LdapException, IOException, ClassNotFoundException
{
- DefaultEntryAttribute dsa = new DefaultEntryAttribute( atCN );
+ DefaultAttribute dsa = new DefaultAttribute( atCN );
dsa.setUpId( "cn" );
- DefaultEntryAttribute dsaSer = deserializeValue( serializeValue( dsa ), atCN );
+ DefaultAttribute dsaSer = deserializeValue( serializeValue( dsa ), atCN );
assertEquals( dsa.toString(), dsaSer.toString() );
assertEquals( "2.5.4.3", dsaSer.getId() );
assertEquals( "cn", dsaSer.getUpId() );
@@ -2093,11 +2093,11 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testSerializeAttributeNullValue() throws LdapException, IOException, ClassNotFoundException
{
- DefaultEntryAttribute dsa = new DefaultEntryAttribute( atDC );
+ DefaultAttribute dsa = new DefaultAttribute( atDC );
dsa.setUpId( "DomainComponent" );
dsa.add( ( String ) null );
- DefaultEntryAttribute dsaSer = deserializeValue( serializeValue( dsa ), atDC );
+ DefaultAttribute dsaSer = deserializeValue( serializeValue( dsa ), atDC );
assertEquals( dsa.toString(), dsaSer.toString() );
assertEquals( "0.9.2342.19200300.100.1.25", dsaSer.getId() );
assertEquals( "DomainComponent", dsaSer.getUpId() );
@@ -2114,11 +2114,11 @@ public class SchemaAwareEntryAttributeTe
@Test
public void testSerializeAttributeBinaryValue() throws LdapException, IOException, ClassNotFoundException
{
- DefaultEntryAttribute dsa = new DefaultEntryAttribute( atPwd );
+ DefaultAttribute dsa = new DefaultAttribute( atPwd );
byte[] password = Strings.getBytesUtf8("secret");
dsa.add( password );
- DefaultEntryAttribute dsaSer = deserializeValue( serializeValue( dsa ), atPwd );
+ DefaultAttribute dsaSer = deserializeValue( serializeValue( dsa ), atPwd );
assertEquals( dsa.toString(), dsaSer.toString() );
assertEquals( "2.5.4.35", dsaSer.getId() );
assertEquals( "userPassword", dsaSer.getUpId() );
Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java Fri Apr 1 00:09:01 2011
@@ -43,7 +43,7 @@ import javax.naming.directory.BasicAttri
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.BinaryValue;
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.entry.StringValue;
@@ -251,11 +251,11 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute oc = new DefaultEntryAttribute( atObjectClass, "top", "person" );
- Attribute cn = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute sn = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute up = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
- Attribute email = new DefaultEntryAttribute( atEMail, "FR", "US" );
+ Attribute oc = new DefaultAttribute( atObjectClass, "top", "person" );
+ Attribute cn = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute sn = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute up = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute email = new DefaultAttribute( atEMail, "FR", "US" );
entry.add( oc, cn, sn, email );
@@ -268,7 +268,7 @@ public class SchemaAwareEntryTest
Attribute attr = entry.get( "objectclass" );
assertEquals( 2, attr.size() );
- Attribute email2 = new DefaultEntryAttribute( atEMail, "UK", "DE" );
+ Attribute email2 = new DefaultAttribute( atEMail, "UK", "DE" );
entry.add( email2, up );
assertEquals( 5, entry.size() );
@@ -1421,7 +1421,7 @@ public class SchemaAwareEntryTest
assertFalse( entry.contains( ( AttributeType ) null, BYTES1 ) );
assertFalse( entry.contains( atPwd, BYTES1 ) );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
assertFalse( entry.contains( attrPWD ) );
@@ -1444,7 +1444,7 @@ public class SchemaAwareEntryTest
assertFalse( entry.contains( ( AttributeType ) null, "test" ) );
assertFalse( entry.contains( atCN, "test" ) );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
assertFalse( entry.contains( attrCN ) );
@@ -1477,8 +1477,8 @@ public class SchemaAwareEntryTest
assertFalse( entry.contains( ( String ) null, strValue1 ) );
assertFalse( entry.contains( atDC, binValue1 ) );
- Attribute attrCN = new DefaultEntryAttribute( atDC, strValue1, strValue2 );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, binValue1, binValue2, binNullValue );
+ Attribute attrCN = new DefaultAttribute( atDC, strValue1, strValue2 );
+ Attribute attrPWD = new DefaultAttribute( atPwd, binValue1, binValue2, binNullValue );
entry.add( attrCN, attrPWD );
@@ -1499,10 +1499,10 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
assertFalse( entry.contains( attrOC, attrCN ) );
@@ -1532,7 +1532,7 @@ public class SchemaAwareEntryTest
assertFalse( entry.contains( ( String ) null, BYTES3 ) );
assertFalse( entry.containsAttribute( "objectClass" ) );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, ( byte[] ) null, BYTES2 );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, ( byte[] ) null, BYTES2 );
entry.add( attrPWD );
@@ -1556,7 +1556,7 @@ public class SchemaAwareEntryTest
assertFalse( entry.contains( ( String ) null, "test" ) );
assertFalse( entry.containsAttribute( "objectClass" ) );
- Attribute attrEMail = new DefaultEntryAttribute( atEMail, "test1", ( String ) null, "test2" );
+ Attribute attrEMail = new DefaultAttribute( atEMail, "test1", ( String ) null, "test2" );
entry.add( attrEMail );
@@ -1580,8 +1580,8 @@ public class SchemaAwareEntryTest
assertFalse( entry.contains( ( String ) null, "test" ) );
assertFalse( entry.containsAttribute( "objectClass" ) );
- Attribute attrEMail = new DefaultEntryAttribute( atEMail, "test1", "test2", ( String ) null );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2, ( byte[] ) null );
+ Attribute attrEMail = new DefaultAttribute( atEMail, "test1", "test2", ( String ) null );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2, ( byte[] ) null );
entry.add( attrEMail, attrPWD );
@@ -1614,10 +1614,10 @@ public class SchemaAwareEntryTest
assertFalse( entry.containsAttribute( atOC ) );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1645,10 +1645,10 @@ public class SchemaAwareEntryTest
assertFalse( entry.containsAttribute( "objectClass" ) );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1681,10 +1681,10 @@ public class SchemaAwareEntryTest
entry2.setDn( EXAMPLE_DN );
assertEquals( entry1, entry2 );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", atPwd, BYTES1, BYTES2 );
entry1.put( attrOC, attrCN, attrSN, attrPWD );
entry2.put( attrOC, attrCN, attrSN );
@@ -1693,8 +1693,8 @@ public class SchemaAwareEntryTest
entry2.put( attrPWD );
assertEquals( entry1, entry2 );
- Attribute attrL1 = new DefaultEntryAttribute( "l", atL, "Paris", "New-York" );
- Attribute attrL2 = new DefaultEntryAttribute( "l", atL, "Paris", "Tokyo" );
+ Attribute attrL1 = new DefaultAttribute( "l", atL, "Paris", "New-York" );
+ Attribute attrL2 = new DefaultAttribute( "l", atL, "Paris", "Tokyo" );
entry1.put( attrL1 );
entry2.put( attrL1 );
@@ -1722,10 +1722,10 @@ public class SchemaAwareEntryTest
assertEquals( 0, entry.getAttributeTypes().size() );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1751,10 +1751,10 @@ public class SchemaAwareEntryTest
assertNull( entry.get( atCN ) );
assertNull( entry.get( ( AttributeType ) null ) );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1778,10 +1778,10 @@ public class SchemaAwareEntryTest
assertNull( entry.get( "cn" ) );
assertNull( entry.get( "badId" ) );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1830,10 +1830,10 @@ public class SchemaAwareEntryTest
entry2.setDn( EXAMPLE_DN );
assertEquals( entry1.hashCode(), entry2.hashCode() );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", atPwd, BYTES1, BYTES2 );
entry1.add( attrOC, attrCN, attrSN, attrPWD );
entry2.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1855,7 +1855,7 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
assertFalse( entry.contains( attrOC ) );
assertFalse( entry.hasObjectClass( attrOC ) );
@@ -1864,14 +1864,14 @@ public class SchemaAwareEntryTest
assertTrue( entry.hasObjectClass( attrOC ) );
- Attribute attrOC2 = new DefaultEntryAttribute( atOC, "person" );
+ Attribute attrOC2 = new DefaultAttribute( atOC, "person" );
assertTrue( entry.hasObjectClass( attrOC2 ) );
- Attribute attrOC3 = new DefaultEntryAttribute( atOC, "inetOrgPerson" );
+ Attribute attrOC3 = new DefaultAttribute( atOC, "inetOrgPerson" );
assertFalse( entry.hasObjectClass( attrOC3 ) );
assertFalse( entry.hasObjectClass( ( Attribute ) null ) );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "top" );
+ Attribute attrCN = new DefaultAttribute( atCN, "top" );
assertFalse( entry.hasObjectClass( attrCN ) );
}
@@ -1887,7 +1887,7 @@ public class SchemaAwareEntryTest
assertFalse( entry.containsAttribute( "objectClass" ) );
assertFalse( entry.hasObjectClass( "top" ) );
- entry.add( new DefaultEntryAttribute( atOC, "top", "person" ) );
+ entry.add( new DefaultAttribute( atOC, "top", "person" ) );
assertTrue( entry.hasObjectClass( "top" ) );
assertTrue( entry.hasObjectClass( "person" ) );
@@ -1938,10 +1938,10 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -2110,11 +2110,11 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute oc = new DefaultEntryAttribute( atObjectClass, "top", "person" );
- Attribute cn = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute sn = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute up = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
- Attribute c = new DefaultEntryAttribute( atEMail, "FR", "US" );
+ Attribute oc = new DefaultAttribute( atObjectClass, "top", "person" );
+ Attribute cn = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute sn = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute up = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute c = new DefaultAttribute( atEMail, "FR", "US" );
List<Attribute> removed = entry.put( oc, cn, sn, c );
@@ -2128,7 +2128,7 @@ public class SchemaAwareEntryTest
Attribute attr = entry.get( "objectclass" );
assertEquals( 2, attr.size() );
- Attribute c2 = new DefaultEntryAttribute( atEMail, "UK", "DE" );
+ Attribute c2 = new DefaultAttribute( atEMail, "UK", "DE" );
removed = entry.put( c2, up );
assertEquals( 1, removed.size() );
assertEquals( c, removed.get( 0 ) );
@@ -2626,16 +2626,16 @@ public class SchemaAwareEntryTest
AttributeType atGN = schemaManager.lookupAttributeTypeRegistry( "givenname" );
AttributeType atStreet = schemaManager.lookupAttributeTypeRegistry( "2.5.4.9" );
- Attribute sa = new DefaultEntryAttribute( atL, "france" );
+ Attribute sa = new DefaultAttribute( atL, "france" );
entry.put( sa );
assertEquals( 1, entry.size() );
assertNotNull( entry.get( "l" ) );
assertEquals( "france", entry.get( "l" ).get().getString() );
- Attribute sb = new DefaultEntryAttribute( atC, "countryTest" );
- Attribute sc = new DefaultEntryAttribute( atGN, "test" );
- Attribute sd = new DefaultEntryAttribute( atStreet, "testStreet" );
+ Attribute sb = new DefaultAttribute( atC, "countryTest" );
+ Attribute sc = new DefaultAttribute( atGN, "test" );
+ Attribute sd = new DefaultAttribute( atStreet, "testStreet" );
entry.put( sb, sc, sd );
assertEquals( 4, entry.size() );
@@ -2647,8 +2647,8 @@ public class SchemaAwareEntryTest
assertEquals( "testStreet", entry.get( atStreet ).get().getString() );
// Test a replacement
- Attribute sbb = new DefaultEntryAttribute( atC, "countryTestTest" );
- Attribute scc = new DefaultEntryAttribute( atGN, "testtest" );
+ Attribute sbb = new DefaultAttribute( atC, "countryTestTest" );
+ Attribute scc = new DefaultAttribute( atGN, "testtest" );
List<Attribute> result = entry.put( sbb, scc );
assertEquals( 2, result.size() );
@@ -2664,7 +2664,7 @@ public class SchemaAwareEntryTest
// test an ObjectClass replacement
AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
- Attribute oc = new DefaultEntryAttribute( "OBJECTCLASS", OBJECT_CLASS_AT, "person", "inetorgperson" );
+ Attribute oc = new DefaultAttribute( "OBJECTCLASS", OBJECT_CLASS_AT, "person", "inetorgperson" );
List<Attribute> oldOc = entry.put( oc );
assertNotNull( oldOc );
@@ -3254,7 +3254,7 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, ( byte[] ) null, BYTES2 );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, ( byte[] ) null, BYTES2 );
entry.put( attrPWD );
assertTrue( entry.remove( atPwd, ( byte[] ) null ) );
@@ -3284,7 +3284,7 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrCN = new DefaultEntryAttribute( atEMail, "test1", ( String ) null, "test2" );
+ Attribute attrCN = new DefaultAttribute( atEMail, "test1", ( String ) null, "test2" );
entry.put( attrCN );
assertTrue( entry.remove( atEMail, ( String ) null ) );
@@ -3320,7 +3320,7 @@ public class SchemaAwareEntryTest
Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
- Attribute attrPWD = new DefaultEntryAttribute( atEMail, "test1", ( String ) null, "test2" );
+ Attribute attrPWD = new DefaultAttribute( atEMail, "test1", ( String ) null, "test2" );
entry.put( attrPWD );
assertTrue( entry.remove( atEMail, strNullValue ) );
@@ -3349,10 +3349,10 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -3381,10 +3381,10 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -3409,10 +3409,10 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( atOC, "top", "person" );
+ Attribute attrCN = new DefaultAttribute( atCN, "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( atSN, "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -3440,7 +3440,7 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, ( byte[] ) null, BYTES2 );
+ Attribute attrPWD = new DefaultAttribute( atPwd, BYTES1, ( byte[] ) null, BYTES2 );
assertFalse( entry.remove( ( String ) null, BYTES1 ) );
assertFalse( entry.remove( " ", BYTES1 ) );
@@ -3474,7 +3474,7 @@ public class SchemaAwareEntryTest
{
Entry entry = new DefaultEntry( schemaManager, EXAMPLE_DN );
- Attribute attrCN = new DefaultEntryAttribute( atEMail, "test1", ( String ) null, "test2" );
+ Attribute attrCN = new DefaultAttribute( atEMail, "test1", ( String ) null, "test2" );
assertFalse( entry.remove( ( String ) null, "test1" ) );
assertFalse( entry.remove( " ", "test1" ) );
@@ -3514,7 +3514,7 @@ public class SchemaAwareEntryTest
Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
- Attribute attrPWD = new DefaultEntryAttribute( atEMail, "test1", ( String ) null, "test2" );
+ Attribute attrPWD = new DefaultAttribute( atEMail, "test1", ( String ) null, "test2" );
entry.put( attrPWD );
assertTrue( entry.remove( "EMail", strNullValue ) );
Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java Fri Apr 1 00:09:01 2011
@@ -34,7 +34,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.List;
-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;
@@ -187,7 +187,7 @@ public class SchemaAwareModificationTest
@Test
public void testCreateClientModification() throws LdapException
{
- Attribute attribute = new DefaultEntryAttribute( atCN );
+ Attribute attribute = new DefaultAttribute( atCN );
attribute.add( "test1", "test2" );
Modification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -213,7 +213,7 @@ public class SchemaAwareModificationTest
@Test
public void testCopyClientModification() throws LdapException
{
- Attribute attribute = new DefaultEntryAttribute( atC );
+ Attribute attribute = new DefaultAttribute( atC );
attribute.add( "test1", "test2" );
Modification serverModification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -225,7 +225,7 @@ public class SchemaAwareModificationTest
serverModification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
assertEquals( ModificationOperation.ADD_ATTRIBUTE, copy.getOperation() );
- Attribute attribute2 = new DefaultEntryAttribute( atCN, "t" );
+ Attribute attribute2 = new DefaultAttribute( atCN, "t" );
serverModification.setAttribute( attribute2 );
assertNotSame( attribute2, copy.getAttribute() );
}
@@ -238,7 +238,7 @@ public class SchemaAwareModificationTest
@Test
public void testCopyModification() throws LdapException
{
- Attribute attribute = new DefaultEntryAttribute( atC.getName() );
+ Attribute attribute = new DefaultAttribute( atC.getName() );
attribute.add( "test1", "test2" );
Modification clientModification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -255,7 +255,7 @@ public class SchemaAwareModificationTest
clientModification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
assertEquals( ModificationOperation.ADD_ATTRIBUTE, copy.getOperation() );
- Attribute attribute2 = new DefaultEntryAttribute( "cn", "t" );
+ Attribute attribute2 = new DefaultAttribute( "cn", "t" );
clientModification.setAttribute( attribute2 );
assertNotSame( attribute2, copy.getAttribute() );
}
@@ -264,7 +264,7 @@ public class SchemaAwareModificationTest
@Test
public void testSerializationModificationADD() throws ClassNotFoundException, IOException, LdapException
{
- Attribute attribute = new DefaultEntryAttribute( atCN );
+ Attribute attribute = new DefaultAttribute( atCN );
attribute.add( "test1", "test2" );
DefaultModification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -279,7 +279,7 @@ public class SchemaAwareModificationTest
@Test
public void testSerializationModificationREPLACE() throws ClassNotFoundException, IOException, LdapException
{
- Attribute attribute = new DefaultEntryAttribute( atCN );
+ Attribute attribute = new DefaultAttribute( atCN );
attribute.add( "test1", "test2" );
DefaultModification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -294,7 +294,7 @@ public class SchemaAwareModificationTest
@Test
public void testSerializationModificationREMOVE() throws ClassNotFoundException, IOException, LdapException
{
- Attribute attribute = new DefaultEntryAttribute( atCN );
+ Attribute attribute = new DefaultAttribute( atCN );
attribute.add( "test1", "test2" );
DefaultModification mod = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );
Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Fri Apr 1 00:09:01 2011
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.Attribute;
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.exception.LdapException;
import org.apache.directory.shared.ldap.model.ldif.ChangeType;
import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
@@ -270,11 +270,11 @@ public class IntegrationUtils
ldif.setDn( dnstr );
ldif.setChangeType( ChangeType.Add );
- Attribute attr = new DefaultEntryAttribute( "objectClass",
+ Attribute attr = new DefaultAttribute( "objectClass",
"top", "person", "organizationalPerson", "inetOrgPerson" );
ldif.addAttribute( attr );
- attr = new DefaultEntryAttribute( "ou", "Engineering", "People" );
+ attr = new DefaultAttribute( "ou", "Engineering", "People" );
ldif.addAttribute( attr );
String uid = dn.getRdn().getNormValue().getString();