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 2010/04/22 08:43:17 UTC
svn commit: r936627 - in
/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry:
DefaultEntryAttributeTest.java DefaultServerAttributeTest.java
Author: elecharny
Date: Thu Apr 22 06:43:17 2010
New Revision: 936627
URL: http://svn.apache.org/viewvc?rev=936627&view=rev
Log:
o Renamed the EntryAttribute class test
o Removed commented test
Added:
directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultEntryAttributeTest.java
- copied, changed from r936557, directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java
Removed:
directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java
Copied: directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultEntryAttributeTest.java (from r936557, directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultEntryAttributeTest.java?p2=directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultEntryAttributeTest.java&p1=directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java&r1=936557&r2=936627&rev=936627&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java (original)
+++ directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultEntryAttributeTest.java Thu Apr 22 06:43:17 2010
@@ -67,7 +67,7 @@ import org.junit.Test;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class DefaultServerAttributeTest
+public class DefaultEntryAttributeTest
{
private static LdifSchemaLoader loader;
@@ -109,7 +109,7 @@ public class DefaultServerAttributeTest
if ( workingDirectory == null )
{
- String path = DefaultServerAttributeTest.class.getResource( "" ).getPath();
+ String path = DefaultEntryAttributeTest.class.getResource( "" ).getPath();
int targetPos = path.indexOf( "target" );
workingDirectory = path.substring( 0, targetPos + 6 );
}
@@ -1328,85 +1328,6 @@ public class DefaultServerAttributeTest
/**
- * Test method put( List<Value> )
- *
- @Test
- public void testPutListOfValues()
- {
- EntryAttribute attr1 = new DefaultEntryAttribute( atDC );
-
- assertEquals( 0, attr1.size() );
-
- List<Value<?>> list = new ArrayList<Value<?>>();
- list.add( NULL_STRING_VALUE );
-
- attr1.add( list );
- assertEquals( 1, attr1.size() );
- assertTrue( attr1.contains( NULL_STRING_VALUE ) );
-
- list.clear();
- list.add( STR_VALUE1 );
- list.add( STR_VALUE2 );
- list.add( STR_VALUE3 );
- attr1.put( list );
- assertEquals( 3, attr1.size() );
- assertTrue( attr1.contains( STR_VALUE1 ) );
- assertTrue( attr1.contains( STR_VALUE2 ) );
- assertTrue( attr1.contains( STR_VALUE3 ) );
-
- list.clear();
- list.add( STR_VALUE1 );
- list.add( NULL_STRING_VALUE );
- list.add( STR_VALUE3 );
- attr1.put( list );
- assertEquals( 3, attr1.size() );
- assertTrue( attr1.contains( STR_VALUE1 ) );
- assertTrue( attr1.contains( NULL_STRING_VALUE ) );
- assertTrue( attr1.contains( STR_VALUE3 ) );
-
- list.clear();
- list.add( STR_VALUE1 );
- list.add( NULL_STRING_VALUE );
- list.add( BIN_VALUE3 );
- attr1.put( list );
- assertEquals( 2, attr1.size() );
- assertTrue( attr1.contains( STR_VALUE1 ) );
- assertTrue( attr1.contains( NULL_STRING_VALUE ) );
- assertFalse( attr1.contains( STR_VALUE3 ) );
-
-
- EntryAttribute attr2 = new DefaultEntryAttribute( atPwd );
- assertEquals( 0, attr2.size() );
-
- list.clear();
- list.add( NULL_BINARY_VALUE );
- attr2.put( list );
- assertEquals( 1, attr2.size() );
- assertTrue( attr2.contains( NULL_BINARY_VALUE ) );
-
- list.clear();
- list.add( BIN_VALUE1 );
- list.add( BIN_VALUE2 );
- list.add( BIN_VALUE3 );
- attr2.put( list );
- assertEquals( 3, attr2.size() );
- assertTrue( attr2.contains( BIN_VALUE1 ) );
- assertTrue( attr2.contains( BIN_VALUE2 ) );
- assertTrue( attr2.contains( BIN_VALUE3 ) );
-
- list.clear();
- list.add( BIN_VALUE1 );
- list.add( NULL_BINARY_VALUE );
- list.add( STR_VALUE3 );
- attr2.put( list );
- assertEquals( 2, attr2.size() );
- assertTrue( attr2.contains( BIN_VALUE1 ) );
- assertTrue( attr2.contains( NULL_BINARY_VALUE ) );
- assertFalse( attr2.contains( BIN_VALUE3 ) );
- }
-
-
- /**
* Test method remove( Value... )
*/
@Test