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 2012/04/26 12:22:15 UTC
svn commit: r1330754 [2/3] - in /directory/apacheds/branches/index-work:
core-constants/src/main/java/org/apache/directory/server/constants/
jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
ldif-partition/src/mai...
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java Thu Apr 26 10:22:13 2012
@@ -172,10 +172,6 @@ public class AvlPartitionTest
avlPartition.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ) );
assertNotNull( avlPartition.getPresenceIndex() );
- assertNull( avlPartition.getSubLevelIndex() );
- avlPartition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) );
- assertNotNull( avlPartition.getSubLevelIndex() );
-
assertNull( avlPartition.getId() );
avlPartition.setId( "foo" );
assertEquals( "foo", avlPartition.getId() );
@@ -242,17 +238,6 @@ public class AvlPartitionTest
{
}
- assertNotNull( partition.getSubLevelIndex() );
-
- try
- {
- partition.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) );
- //fail();
- }
- catch ( IllegalStateException e )
- {
- }
-
assertNotNull( partition.getId() );
try
@@ -302,7 +287,7 @@ public class AvlPartitionTest
Iterator<String> systemIndices = partition.getSystemIndices();
- for ( int i = 0; i < 9; i++ )
+ for ( int i = 0; i < 8; i++ )
{
assertTrue( systemIndices.hasNext() );
assertNotNull( systemIndices.next() );
@@ -435,134 +420,6 @@ public class AvlPartitionTest
}
- @Test
- public void testSubLevelIndex() throws Exception
- {
- Index idx = partition.getSubLevelIndex();
-
- assertEquals( 19, idx.count() );
-
- Cursor<IndexEntry<Long, Long>> cursor = idx.forwardCursor( 2L );
-
- assertTrue( cursor.next() );
- assertEquals( 2, ( long ) cursor.get().getId() );
-
- assertTrue( cursor.next() );
- assertEquals( 5, ( long ) cursor.get().getId() );
-
- assertTrue( cursor.next() );
- assertEquals( 6, ( long ) cursor.get().getId() );
-
- assertFalse( cursor.next() );
-
- idx.drop( 5L );
-
- cursor.close();
-
- cursor = idx.forwardCursor( 2L );
-
- assertTrue( cursor.next() );
- assertEquals( 2, ( long ) cursor.get().getId() );
-
- assertTrue( cursor.next() );
- assertEquals( 6, ( long ) cursor.get().getId() );
-
- assertFalse( cursor.next() );
-
- cursor.close();
-
- // dn id 12
- Dn martinDn = new Dn( schemaManager, "cn=Marting King,ou=Sales,o=Good Times Co." );
- DefaultEntry entry = new DefaultEntry( schemaManager, martinDn,
- "objectClass: top",
- "objectClass: person",
- "objectClass: organizationalPerson",
- "ou: Sales",
- "cn: Martin King",
- "entryCSN", new CsnFactory( 1 ).newInstance().toString(),
- "entryUUID", UUID.randomUUID().toString() );
-
- AddOperationContext addContext = new AddOperationContext( null, entry );
- partition.add( addContext );
-
- cursor = idx.forwardCursor( 2L );
- cursor.afterLast();
- assertTrue( cursor.previous() );
- assertEquals( 12, ( long ) cursor.get().getId() );
-
- cursor.close();
-
- Dn newParentDn = new Dn( schemaManager, "ou=Board of Directors,o=Good Times Co." );
-
- Dn newDn = newParentDn.add( martinDn.getRdn() );
- partition.move( martinDn, newParentDn, newDn, new ClonedServerEntry( entry ) );
-
- cursor = idx.forwardCursor( 3L );
- cursor.afterLast();
- assertTrue( cursor.previous() );
- assertEquals( 12, ( long ) cursor.get().getId() );
-
- cursor.close();
-
- // dn id 13
- Dn marketingDn = new Dn( schemaManager, "ou=Marketing,ou=Sales,o=Good Times Co." );
- entry = new DefaultEntry( schemaManager, marketingDn,
- "objectClass: top",
- "objectClass: organizationalUnit",
- "ou: Marketing",
- "entryCSN", new CsnFactory( 1 ).newInstance().toString(),
- "entryUUID", UUID.randomUUID().toString() );
-
- addContext = new AddOperationContext( null, entry );
- partition.add( addContext );
-
- // dn id 14
- Dn jimmyDn = new Dn( schemaManager, "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
- entry = new DefaultEntry( schemaManager, jimmyDn,
- "objectClass: top",
- "objectClass: person",
- "objectClass: organizationalPerson",
- "ou: Marketing",
- "cn: Jimmy Wales",
- "entryCSN", new CsnFactory( 1 ).newInstance().toString(),
- "entryUUID", UUID.randomUUID().toString() );
-
- addContext = new AddOperationContext( null, entry );
- partition.add( addContext );
-
- newDn = newParentDn.add( marketingDn.getRdn() );
- partition.move( marketingDn, newParentDn, newDn, new ClonedServerEntry( entry ) );
-
- cursor = idx.forwardCursor( 3L );
- cursor.afterLast();
-
- assertTrue( cursor.previous() );
- assertEquals( 14, ( long ) cursor.get().getId() );
-
- assertTrue( cursor.previous() );
- assertEquals( 13, ( long ) cursor.get().getId() );
-
- assertTrue( cursor.previous() );
- assertEquals( 12, ( long ) cursor.get().getId() );
-
- assertTrue( cursor.previous() );
- assertEquals( 10, ( long ) cursor.get().getId() );
-
- assertTrue( cursor.previous() );
- assertEquals( 9, ( long ) cursor.get().getId() );
-
- assertTrue( cursor.previous() );
- assertEquals( 7, ( long ) cursor.get().getId() );
-
- assertTrue( cursor.previous() );
- assertEquals( 3, ( long ) cursor.get().getId() );
-
- assertFalse( cursor.previous() );
-
- cursor.close();
- }
-
-
@Test(expected = LdapNoSuchObjectException.class)
public void testAddWithoutParentId() throws Exception
{
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java Thu Apr 26 10:22:13 2012
@@ -291,20 +291,20 @@ public class AvlRdnIndexTest
cursor.next();
IndexEntry<ParentIdAndRdn<Long>, Long> e1 = cursor.get();
assertEquals( 0, ( long ) e1.getId() );
- assertEquals( "cn=key", e1.getValue().getRdns()[0].getName() );
- assertEquals( 0, e1.getValue().getParentId().longValue() );
+ assertEquals( "cn=key", e1.getKey().getRdns()[0].getName() );
+ assertEquals( 0, e1.getKey().getParentId().longValue() );
cursor.next();
IndexEntry<ParentIdAndRdn<Long>, Long> e2 = cursor.get();
assertEquals( 1, ( long ) e2.getId() );
- assertEquals( "cn=key1", e2.getValue().getRdns()[0].getName() );
- assertEquals( 1, e2.getValue().getParentId().longValue() );
+ assertEquals( "cn=key1", e2.getKey().getRdns()[0].getName() );
+ assertEquals( 1, e2.getKey().getParentId().longValue() );
cursor.next();
IndexEntry<ParentIdAndRdn<Long>, Long> e3 = cursor.get();
assertEquals( 2, ( long ) e3.getId() );
- assertEquals( "cn=key2", e3.getValue().getRdns()[0].getName() );
- assertEquals( 2, e3.getValue().getParentId().longValue() );
+ assertEquals( "cn=key2", e3.getKey().getRdns()[0].getName() );
+ assertEquals( 2, e3.getKey().getParentId().longValue() );
cursor.close();
}
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Thu Apr 26 10:22:13 2012
@@ -182,17 +182,17 @@ public class AndCursorTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 8, ( long ) cursor.get().getId() );
- assertEquals( "jack daniels", cursor.get().getValue() );
+ assertEquals( "jack daniels", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "johnny walker", cursor.get().getValue() );
+ assertEquals( "johnny walker", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -233,19 +233,19 @@ public class AndCursorTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 8, ( long ) cursor.get().getId() );
- assertEquals( "jack daniels", cursor.get().getValue() );
+ assertEquals( "jack daniels", cursor.get().getKey() );
cursor.first();
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "johnny walker", cursor.get().getValue() );
+ assertEquals( "johnny walker", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -255,19 +255,19 @@ public class AndCursorTest
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "johnny walker", cursor.get().getValue() );
+ assertEquals( "johnny walker", cursor.get().getKey() );
cursor.last();
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 8, ( long ) cursor.get().getId() );
- assertEquals( "jack daniels", cursor.get().getValue() );
+ assertEquals( "jack daniels", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Thu Apr 26 10:22:13 2012
@@ -194,22 +194,22 @@ public class GreaterEqTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 6L, ( long ) cursor.get().getId() );
- assertEquals( "4", cursor.get().getValue() );
+ assertEquals( "4", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 7L, ( long ) cursor.get().getId() );
- assertEquals( "5", cursor.get().getValue() );
+ assertEquals( "5", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 8L, ( long ) cursor.get().getId() );
- assertEquals( "6", cursor.get().getValue() );
+ assertEquals( "6", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -224,22 +224,22 @@ public class GreaterEqTest
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 6L, ( long ) cursor.get().getId() );
- assertEquals( "4", cursor.get().getValue() );
+ assertEquals( "4", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 7L, ( long ) cursor.get().getId() );
- assertEquals( "5", cursor.get().getValue() );
+ assertEquals( "5", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 8L, ( long ) cursor.get().getId() );
- assertEquals( "6", cursor.get().getValue() );
+ assertEquals( "6", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -256,22 +256,22 @@ public class GreaterEqTest
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 8L, ( long ) cursor.get().getId() );
- assertEquals( "6", cursor.get().getValue() );
+ assertEquals( "6", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 7L, ( long ) cursor.get().getId() );
- assertEquals( "5", cursor.get().getValue() );
+ assertEquals( "5", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 6L, ( long ) cursor.get().getId() );
- assertEquals( "4", cursor.get().getValue() );
+ assertEquals( "4", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -286,22 +286,22 @@ public class GreaterEqTest
assertTrue( cursor.available() );
assertEquals( 8L, ( long ) cursor.get().getId() );
- assertEquals( "6", cursor.get().getValue() );
+ assertEquals( "6", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 7L, ( long ) cursor.get().getId() );
- assertEquals( "5", cursor.get().getValue() );
+ assertEquals( "5", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 6L, ( long ) cursor.get().getId() );
- assertEquals( "4", cursor.get().getValue() );
+ assertEquals( "4", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -312,7 +312,7 @@ public class GreaterEqTest
cursor = new GreaterEqCursor( store, evaluator );
ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "5" );
+ indexEntry.setKey( "5" );
assertFalse( cursor.available() );
cursor.before( indexEntry );
@@ -321,12 +321,12 @@ public class GreaterEqTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 7L, ( long ) cursor.get().getId() );
- assertEquals( "5", cursor.get().getValue() );
+ assertEquals( "5", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 8L, ( long ) cursor.get().getId() );
- assertEquals( "6", cursor.get().getValue() );
+ assertEquals( "6", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -335,29 +335,29 @@ public class GreaterEqTest
cursor = new GreaterEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "7" );
+ indexEntry.setKey( "7" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
assertTrue( cursor.previous() );
assertEquals( 8L, ( long ) cursor.get().getId() );
- assertEquals( "6", cursor.get().getValue() );
+ assertEquals( "6", cursor.get().getKey() );
cursor.close();
cursor = new GreaterEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "3" );
+ indexEntry.setKey( "3" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
assertTrue( cursor.next() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
cursor.close();
// ---------- test after() ----------
cursor = new GreaterEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "4" );
+ indexEntry.setKey( "4" );
assertFalse( cursor.available() );
cursor.after( indexEntry );
@@ -366,12 +366,12 @@ public class GreaterEqTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 7L, ( long ) cursor.get().getId() );
- assertEquals( "5", cursor.get().getValue() );
+ assertEquals( "5", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 8L, ( long ) cursor.get().getId() );
- assertEquals( "6", cursor.get().getValue() );
+ assertEquals( "6", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -380,22 +380,22 @@ public class GreaterEqTest
cursor = new GreaterEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "7" );
+ indexEntry.setKey( "7" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
assertTrue( cursor.previous() );
assertEquals( 8L, ( long ) cursor.get().getId() );
- assertEquals( "6", cursor.get().getValue() );
+ assertEquals( "6", cursor.get().getKey() );
cursor.close();
cursor = new GreaterEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "3" );
+ indexEntry.setKey( "3" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
assertTrue( cursor.previous() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
cursor.close();
}
@@ -431,7 +431,7 @@ public class GreaterEqTest
while ( cursor.next() )
{
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
}
assertEquals( 4, set.size() );
assertTrue( set.contains( new Tuple<String, Long>( "3", 5L ) ) );
@@ -452,12 +452,12 @@ public class GreaterEqTest
cursor.first();
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
while ( cursor.next() )
{
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
}
assertEquals( 4, set.size() );
assertTrue( set.contains( new Tuple<String, Long>( "3", 5L ) ) );
@@ -481,7 +481,7 @@ public class GreaterEqTest
while ( cursor.previous() )
{
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
}
assertEquals( 4, set.size() );
assertTrue( set.contains( new Tuple<String, Long>( "3", 5L ) ) );
@@ -501,12 +501,12 @@ public class GreaterEqTest
cursor.last();
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
while ( cursor.previous() )
{
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
}
assertEquals( 4, set.size() );
assertTrue( set.contains( new Tuple<String, Long>( "3", 5L ) ) );
@@ -523,7 +523,7 @@ public class GreaterEqTest
cursor = new GreaterEqCursor( store, evaluator );
ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "2" );
+ indexEntry.setKey( "2" );
try
{
@@ -540,7 +540,7 @@ public class GreaterEqTest
cursor = new GreaterEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "2" );
+ indexEntry.setKey( "2" );
try
{
cursor.after( indexEntry );
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Thu Apr 26 10:22:13 2012
@@ -196,27 +196,27 @@ public class LessEqTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 1L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 2L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 3L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 4L, ( long ) cursor.get().getId() );
- assertEquals( "2", cursor.get().getValue() );
+ assertEquals( "2", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -231,27 +231,27 @@ public class LessEqTest
assertTrue( cursor.available() );
assertEquals( 1L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 2L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 3L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 4L, ( long ) cursor.get().getId() );
- assertEquals( "2", cursor.get().getValue() );
+ assertEquals( "2", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -268,27 +268,27 @@ public class LessEqTest
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 4L, ( long ) cursor.get().getId() );
- assertEquals( "2", cursor.get().getValue() );
+ assertEquals( "2", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 3L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 2L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 1L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -303,27 +303,27 @@ public class LessEqTest
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 4L, ( long ) cursor.get().getId() );
- assertEquals( "2", cursor.get().getValue() );
+ assertEquals( "2", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 3L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 2L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 1L, ( long ) cursor.get().getId() );
- assertEquals( "1", cursor.get().getValue() );
+ assertEquals( "1", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -334,7 +334,7 @@ public class LessEqTest
cursor = new LessEqCursor( store, evaluator );
ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "2" );
+ indexEntry.setKey( "2" );
assertFalse( cursor.available() );
cursor.before( indexEntry );
@@ -343,12 +343,12 @@ public class LessEqTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 4L, ( long ) cursor.get().getId() );
- assertEquals( "2", cursor.get().getValue() );
+ assertEquals( "2", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -357,29 +357,29 @@ public class LessEqTest
cursor = new LessEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "7" );
+ indexEntry.setKey( "7" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
assertTrue( cursor.previous() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
cursor.close();
cursor = new LessEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "3" );
+ indexEntry.setKey( "3" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
assertTrue( cursor.next() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
cursor.close();
// ---------- test after() ----------
cursor = new LessEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "1" );
+ indexEntry.setKey( "1" );
assertFalse( cursor.available() );
cursor.after( indexEntry );
@@ -388,12 +388,12 @@ public class LessEqTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 4L, ( long ) cursor.get().getId() );
- assertEquals( "2", cursor.get().getValue() );
+ assertEquals( "2", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -402,22 +402,22 @@ public class LessEqTest
cursor = new LessEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "7" );
+ indexEntry.setKey( "7" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
assertTrue( cursor.previous() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
cursor.close();
cursor = new LessEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "3" );
+ indexEntry.setKey( "3" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
assertTrue( cursor.previous() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "3", cursor.get().getValue() );
+ assertEquals( "3", cursor.get().getKey() );
cursor.close();
}
@@ -452,7 +452,7 @@ public class LessEqTest
while ( cursor.next() )
{
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
}
assertEquals( 5, set.size() );
@@ -474,12 +474,12 @@ public class LessEqTest
cursor.first();
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
while ( cursor.next() )
{
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
}
assertEquals( 5, set.size() );
@@ -504,7 +504,7 @@ public class LessEqTest
while ( cursor.previous() )
{
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
}
assertEquals( 5, set.size() );
@@ -526,12 +526,12 @@ public class LessEqTest
cursor.last();
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
while ( cursor.previous() )
{
assertTrue( cursor.available() );
- set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+ set.add( new Tuple<String, Long>( cursor.get().getKey(), cursor.get().getId() ) );
}
assertEquals( 5, set.size() );
@@ -550,7 +550,7 @@ public class LessEqTest
cursor = new LessEqCursor( store, evaluator );
ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "2" );
+ indexEntry.setKey( "2" );
try
{
@@ -567,7 +567,7 @@ public class LessEqTest
cursor = new LessEqCursor( store, evaluator );
indexEntry = new ForwardIndexEntry<String, Long>();
- indexEntry.setValue( "2" );
+ indexEntry.setKey( "2" );
try
{
cursor.after( indexEntry );
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Thu Apr 26 10:22:13 2012
@@ -180,17 +180,17 @@ public class NestedFilterTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "walker", cursor.get().getValue() );
+ assertEquals( "walker", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 7, ( long ) cursor.get().getId() );
- assertEquals( "apache", cursor.get().getValue() );
+ assertEquals( "apache", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 9, ( long ) cursor.get().getId() );
- assertEquals( "apache", cursor.get().getValue() );
+ assertEquals( "apache", cursor.get().getKey() );
assertFalse( cursor.next() );
cursor.close();
@@ -210,7 +210,7 @@ public class NestedFilterTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "walker", cursor.get().getValue() );
+ assertEquals( "walker", cursor.get().getKey() );
assertFalse( cursor.next() );
cursor.close();
@@ -235,7 +235,7 @@ public class NestedFilterTest
{
assertTrue( cursor.available() );
set.add( cursor.get().getId() );
- assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
+ assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getKey() ) );
}
assertEquals( 2, set.size() );
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Thu Apr 26 10:22:13 2012
@@ -185,7 +185,7 @@ public class NotCursorTest
{
assertTrue( cursor.available() );
set.add( cursor.get().getId() );
- assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
+ assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getKey() ) );
}
assertEquals( 5, set.size() );
@@ -222,7 +222,7 @@ public class NotCursorTest
{
assertTrue( cursor.available() );
set.add( cursor.get().getId() );
- assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
+ assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getKey() ) );
}
assertEquals( 5, set.size() );
@@ -243,7 +243,7 @@ public class NotCursorTest
{
assertTrue( cursor.available() );
set.add( cursor.get().getId() );
- assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
+ assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getKey() ) );
}
assertEquals( 5, set.size() );
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Thu Apr 26 10:22:13 2012
@@ -175,14 +175,14 @@ public class OneLevelScopeTest
IndexEntry<Long, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 5L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -199,14 +199,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 5L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -238,14 +238,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 5L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -272,14 +272,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 5L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -308,14 +308,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 5L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -331,14 +331,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 5L, ( long ) indexEntry.getId() );
- assertEquals( 2L, ( long ) indexEntry.getValue() );
+ assertEquals( 2L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -364,14 +364,14 @@ public class OneLevelScopeTest
IndexEntry<Long, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 11L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -388,14 +388,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 11L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -424,14 +424,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 11L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -458,14 +458,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 11L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -492,14 +492,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 11L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -515,14 +515,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 11L, ( long ) indexEntry.getId() );
- assertEquals( 4L, ( long ) indexEntry.getValue() );
+ assertEquals( 4L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -549,14 +549,14 @@ public class OneLevelScopeTest
IndexEntry<Long, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -572,14 +572,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -596,7 +596,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
cursor.close();
/*
@@ -605,7 +605,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -621,7 +621,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
cursor.close();
/*
@@ -630,7 +630,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -646,7 +646,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
cursor.close();
/*
@@ -655,7 +655,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -683,7 +683,7 @@ public class OneLevelScopeTest
IndexEntry<Long, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 7L, ( long ) indexEntry.getValue() );
+ assertEquals( 7L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -699,7 +699,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 7L, ( long ) indexEntry.getValue() );
+ assertEquals( 7L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -716,7 +716,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 7L, ( long ) indexEntry.getValue() );
+ assertEquals( 7L, ( long ) indexEntry.getKey() );
cursor.close();
/*
@@ -734,7 +734,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 7L, ( long ) indexEntry.getValue() );
+ assertEquals( 7L, ( long ) indexEntry.getKey() );
cursor.close();
/*
@@ -752,7 +752,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 7L, ( long ) indexEntry.getValue() );
+ assertEquals( 7L, ( long ) indexEntry.getKey() );
cursor.close();
/*
@@ -809,28 +809,28 @@ public class OneLevelScopeTest
IndexEntry<Long, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 13L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -846,28 +846,28 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 13L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -884,14 +884,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
cursor.close();
/*
@@ -900,14 +900,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 13L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -923,7 +923,7 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
cursor.close();
/*
@@ -932,21 +932,21 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 13L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -963,14 +963,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
cursor.close();
/*
@@ -979,14 +979,14 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 13L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -1002,28 +1002,28 @@ public class OneLevelScopeTest
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 13L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
- assertEquals( 3L, ( long ) indexEntry.getValue() );
+ assertEquals( 3L, ( long ) indexEntry.getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -1113,7 +1113,7 @@ public class OneLevelScopeTest
// test before()
ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
- entry.setValue( 3L );
+ entry.setKey( 3L );
cursor.before( entry );
}
finally
@@ -1138,7 +1138,7 @@ public class OneLevelScopeTest
// test after()
ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
- entry.setValue( 3L );
+ entry.setKey( 3L );
cursor.after( entry );
}
finally
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Thu Apr 26 10:22:13 2012
@@ -181,32 +181,32 @@ public class OrCursorTest
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "walker", cursor.get().getValue() );
+ assertEquals( "walker", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 11, ( long ) cursor.get().getId() );
- assertEquals( "johnny walker", cursor.get().getValue() );
+ assertEquals( "johnny walker", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 10, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 9, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 8, ( long ) cursor.get().getId() );
- assertEquals( "jack daniels", cursor.get().getValue() );
+ assertEquals( "jack daniels", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -216,32 +216,32 @@ public class OrCursorTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 8, ( long ) cursor.get().getId() );
- assertEquals( "jack daniels", cursor.get().getValue() );
+ assertEquals( "jack daniels", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 9, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 10, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 11, ( long ) cursor.get().getId() );
- assertEquals( "johnny walker", cursor.get().getValue() );
+ assertEquals( "johnny walker", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "walker", cursor.get().getValue() );
+ assertEquals( "walker", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -293,32 +293,32 @@ public class OrCursorTest
assertTrue( cursor.first() );
assertTrue( cursor.available() );
assertEquals( 8, ( long ) cursor.get().getId() );
- assertEquals( "jack daniels", cursor.get().getValue() );
+ assertEquals( "jack daniels", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 9, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 10, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "walker", cursor.get().getValue() );
+ assertEquals( "walker", cursor.get().getKey() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 11, ( long ) cursor.get().getId() );
- assertEquals( "johnny walker", cursor.get().getValue() );
+ assertEquals( "johnny walker", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -330,32 +330,32 @@ public class OrCursorTest
assertTrue( cursor.last() );
assertTrue( cursor.available() );
assertEquals( 11, ( long ) cursor.get().getId() );
- assertEquals( "johnny walker", cursor.get().getValue() );
+ assertEquals( "johnny walker", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "walker", cursor.get().getValue() );
+ assertEquals( "walker", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 10, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 9, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "jim bean", cursor.get().getValue() );
+ assertEquals( "jim bean", cursor.get().getKey() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 8, ( long ) cursor.get().getId() );
- assertEquals( "jack daniels", cursor.get().getValue() );
+ assertEquals( "jack daniels", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
Modified: directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1330754&r1=1330753&r2=1330754&view=diff
==============================================================================
--- directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/branches/index-work/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Thu Apr 26 10:22:13 2012
@@ -186,41 +186,41 @@ public class PresenceTest
// test first()
cursor.first();
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getKey() );
// test last()
cursor.last();
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getKey() );
// test beforeFirst()
cursor.beforeFirst();
assertFalse( cursor.available() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getKey() );
// test afterLast()
cursor.afterLast();
assertFalse( cursor.available() );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getKey() );
// test before()
ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.CN_AT_OID );
+ entry.setKey( SchemaConstants.CN_AT_OID );
cursor.before( entry );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getKey() );
// test after()
entry = new ForwardIndexEntry<String, Long>();
cursor.after( entry );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getKey() );
cursor.close();
node = new PresenceNode( schemaManager.getAttributeType( "ou" ) );
@@ -314,7 +314,7 @@ public class PresenceTest
while ( cursor.next() )
{
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getKey() );
set.add( cursor.get().getId() );
}
@@ -329,19 +329,19 @@ public class PresenceTest
// test first()
cursor.first();
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getKey() );
// test last()
cursor.last();
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getKey() );
// test beforeFirst()
cursor.beforeFirst();
assertFalse( cursor.available() );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getKey() );
// test afterLast()
set.clear();
@@ -351,7 +351,7 @@ public class PresenceTest
while ( cursor.previous() )
{
assertTrue( cursor.available() );
- assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getValue() );
+ assertEquals( SchemaConstants.SN_AT_OID, cursor.get().getKey() );
set.add( cursor.get().getId() );
}
@@ -390,11 +390,11 @@ public class PresenceTest
PresenceNode node = new PresenceNode( schemaManager.getAttributeType( "cn" ) );
PresenceEvaluator<Long> evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.CN_AT_OID );
+ entry.setKey( SchemaConstants.CN_AT_OID );
entry.setId( ( long ) 3 );
assertFalse( evaluator.evaluate( entry ) );
entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.CN_AT_OID );
+ entry.setKey( SchemaConstants.CN_AT_OID );
entry.setId( ( long ) 5 );
assertTrue( evaluator.evaluate( entry ) );
}
@@ -420,7 +420,7 @@ public class PresenceTest
assertTrue( evaluator.evaluate( entry ) );
entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( oid );
+ entry.setKey( oid );
entry.setId( ( long ) 5 );
assertTrue( evaluator.evaluate( entry ) );
}
@@ -432,22 +432,22 @@ public class PresenceTest
PresenceNode node = new PresenceNode( schemaManager.getAttributeType( "name" ) );
PresenceEvaluator<Long> evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.NAME_AT_OID );
+ entry.setKey( SchemaConstants.NAME_AT_OID );
entry.setId( ( long ) 3 );
assertTrue( evaluator.evaluate( entry ) );
entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.NAME_AT_OID );
+ entry.setKey( SchemaConstants.NAME_AT_OID );
entry.setId( ( long ) 5 );
assertTrue( evaluator.evaluate( entry ) );
node = new PresenceNode( schemaManager.getAttributeType( "searchGuide" ) );
evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.SEARCHGUIDE_AT_OID );
+ entry.setKey( SchemaConstants.SEARCHGUIDE_AT_OID );
entry.setId( ( long ) 3 );
assertFalse( evaluator.evaluate( entry ) );
entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.SEARCHGUIDE_AT_OID );
+ entry.setKey( SchemaConstants.SEARCHGUIDE_AT_OID );
entry.setId( ( long ) 5 );
entry.setEntry( store.lookup( ( long ) 5 ) );
assertFalse( evaluator.evaluate( entry ) );
@@ -455,11 +455,11 @@ public class PresenceTest
node = new PresenceNode( schemaManager.getAttributeType( "st" ) );
evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.ST_AT_OID );
+ entry.setKey( SchemaConstants.ST_AT_OID );
entry.setId( ( long ) 3 );
assertFalse( evaluator.evaluate( entry ) );
entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.ST_AT_OID );
+ entry.setKey( SchemaConstants.ST_AT_OID );
entry.setId( ( long ) 5 );
entry.setEntry( store.lookup( ( long ) 5 ) );
assertFalse( evaluator.evaluate( entry ) );
@@ -517,7 +517,7 @@ public class PresenceTest
// test before()
ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.SN_AT_OID );
+ entry.setKey( SchemaConstants.SN_AT_OID );
cursor.before( entry );
}
finally
@@ -540,7 +540,7 @@ public class PresenceTest
// test before()
ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
- entry.setValue( SchemaConstants.SN_AT_OID );
+ entry.setKey( SchemaConstants.SN_AT_OID );
cursor.after( entry );
}
finally