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/30 17:59:27 UTC
svn commit: r1332268 [4/5] - in /directory/apacheds/trunk: ./ all/
core-annotations/
core-annotations/src/main/java/org/apache/directory/server/core/factory/
core-api/
core-api/src/main/java/org/apache/directory/server/core/api/changelog/
core-api/src/...
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Mon Apr 30 15:59:22 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/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Mon Apr 30 15:59:22 2012
@@ -159,8 +159,12 @@ public class OneLevelScopeTest
@Test
public void testCursorNoDeref() throws Exception
{
- ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
- + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=sales," + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -175,14 +179,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 +203,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 +242,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 +276,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 +312,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 +335,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() );
@@ -349,8 +353,13 @@ public class OneLevelScopeTest
@Test
public void testCursorNoDerefReturnAliases() throws Exception
{
- ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
- + "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=engineering,"
+ + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -364,14 +373,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 +397,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 +433,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 +467,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 +501,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 +524,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() );
@@ -533,8 +542,11 @@ public class OneLevelScopeTest
@Test
public void testCursorWithDereferencing() throws Exception
{
- ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new Dn( SchemaConstants.OU_AT_OID
- + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.DEREF_IN_SEARCHING, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -549,14 +561,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 +584,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 +608,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 +617,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 +633,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 +642,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 +658,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 +667,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() );
@@ -666,9 +678,14 @@ public class OneLevelScopeTest
@Test
public void testCursorWithDereferencing2() throws Exception
{
- ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new Dn( SchemaConstants.OU_AT_OID
- + "=apache," + SchemaConstants.OU_AT_OID + "=board of directors," + SchemaConstants.O_AT_OID
- + "=good times co." ), SearchScope.ONELEVEL );
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=apache," + SchemaConstants.OU_AT_OID
+ + "=board of directors,"
+ + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.DEREF_IN_SEARCHING, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -683,7 +700,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 +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() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -716,7 +733,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 +751,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 +769,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();
/*
@@ -793,8 +810,13 @@ public class OneLevelScopeTest
addContext = new AddOperationContext( null, entry );
( ( Partition ) store ).add( addContext );
- ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new Dn( SchemaConstants.OU_AT_OID
- + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
+ dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=board of directors,"
+ + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.DEREF_IN_SEARCHING, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -809,28 +831,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 +868,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 +906,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 +922,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 +945,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 +954,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 +985,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 +1001,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 +1024,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() );
@@ -1034,8 +1056,12 @@ public class OneLevelScopeTest
@Test
public void testEvaluatorNoDereferencing() throws Exception
{
- ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
- + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=sales," + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
@@ -1048,8 +1074,13 @@ public class OneLevelScopeTest
@Test
public void testEvaluatorWithDereferencing() throws Exception
{
- ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, new Dn( SchemaConstants.OU_AT_OID
- + "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=engineering,"
+ + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.DEREF_ALWAYS, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
assertEquals( node, evaluator.getExpression() );
@@ -1081,11 +1112,15 @@ public class OneLevelScopeTest
public void testInvalidCursorPositionException() throws Exception
{
OneLevelScopeCursor<Long> cursor = null;
-
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=sales,"
+ + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
try
{
- ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
- + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -1102,18 +1137,22 @@ public class OneLevelScopeTest
public void testUnsupportBeforeWithoutIndex() throws Exception
{
OneLevelScopeCursor<Long> cursor = null;
-
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=sales,"
+ + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
try
{
- ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
- + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
cursor = new OneLevelScopeCursor<Long>( store, evaluator );
// test before()
ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
- entry.setValue( 3L );
+ entry.setKey( 3L );
cursor.before( entry );
}
finally
@@ -1127,18 +1166,21 @@ public class OneLevelScopeTest
public void testUnsupportAfterWithoutIndex() throws Exception
{
OneLevelScopeCursor<Long> cursor = null;
-
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=sales," + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
try
{
- ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
- + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.ONELEVEL );
OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
cursor = new OneLevelScopeCursor<Long>( store, evaluator );
// test after()
ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
- entry.setValue( 3L );
+ entry.setKey( 3L );
cursor.after( entry );
}
finally
@@ -1151,8 +1193,13 @@ public class OneLevelScopeTest
@Test(expected = IllegalStateException.class)
public void testIllegalStateBadScope() throws Exception
{
- ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
- + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
+ Dn dn = new Dn( SchemaConstants.OU_AT_OID
+ + "=sales,"
+ + SchemaConstants.O_AT_OID
+ + "=good times co." );
+ long baseId = store.getEntryId( dn );
+
+ ScopeNode<Long> node = new ScopeNode<Long>( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.SUBTREE );
new OneLevelScopeEvaluator<Entry, Long>( store, node );
}
}
\ No newline at end of file
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Mon Apr 30 15:59:22 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/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Mon Apr 30 15:59:22 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
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Mon Apr 30 15:59:22 2012
@@ -163,29 +163,29 @@ public class SubstringTest
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( 5, ( long ) cursor.get().getId() );
- assertEquals( "johnny walker", cursor.get().getValue() );
+ assertEquals( "johnny 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() );
@@ -201,29 +201,29 @@ public class SubstringTest
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( "johnny walker", cursor.get().getValue() );
+ assertEquals( "johnny 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() );
@@ -238,29 +238,29 @@ public class SubstringTest
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( 5, ( 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() );
@@ -273,29 +273,29 @@ public class SubstringTest
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( "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() );
@@ -317,15 +317,15 @@ public class SubstringTest
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() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -338,15 +338,15 @@ public class SubstringTest
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() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -361,15 +361,15 @@ public class SubstringTest
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() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -382,15 +382,15 @@ public class SubstringTest
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() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -412,15 +412,15 @@ public class SubstringTest
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() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -434,15 +434,15 @@ public class SubstringTest
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() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -457,15 +457,15 @@ public class SubstringTest
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() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -478,15 +478,15 @@ public class SubstringTest
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() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -508,7 +508,7 @@ public class SubstringTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "bean", cursor.get().getValue() );
+ assertEquals( "bean", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -521,7 +521,7 @@ public class SubstringTest
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "bean", cursor.get().getValue() );
+ assertEquals( "bean", cursor.get().getKey() );
assertFalse( cursor.next() );
assertFalse( cursor.available() );
@@ -536,7 +536,7 @@ public class SubstringTest
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "bean", cursor.get().getValue() );
+ assertEquals( "bean", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -550,7 +550,7 @@ public class SubstringTest
assertTrue( cursor.available() );
assertEquals( 6, ( long ) cursor.get().getId() );
- assertEquals( "bean", cursor.get().getValue() );
+ assertEquals( "bean", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -572,7 +572,7 @@ public class SubstringTest
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() );
@@ -585,7 +585,7 @@ public class SubstringTest
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() );
@@ -600,7 +600,7 @@ public class SubstringTest
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
- assertEquals( "walker", cursor.get().getValue() );
+ assertEquals( "walker", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -614,7 +614,7 @@ public class SubstringTest
assertTrue( cursor.available() );
assertEquals( 5L, ( long ) cursor.get().getId() );
- assertEquals( "walker", cursor.get().getValue() );
+ assertEquals( "walker", cursor.get().getKey() );
assertFalse( cursor.previous() );
assertFalse( cursor.available() );
@@ -759,7 +759,7 @@ public class SubstringTest
// 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
@@ -782,7 +782,7 @@ public class SubstringTest
// 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