directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1199852 [3/5] - in /directory/apacheds/branches/apacheds-txns/xdbm-partition/src: main/java/org/apache/directory/server/core/partition/impl/avl/ main/java/org/apache/directory/server/core/partition/impl/btree/ main/java/org/apache/director...
Date Wed, 09 Nov 2011 17:04:47 GMT
Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1199852&r1=1199851&r2=1199852&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Wed Nov  9 17:04:46 2011
@@ -79,7 +79,7 @@ public class LessEqTest
     public static final Logger LOG = LoggerFactory.getLogger( LessEqTest.class );
 
     File wkdir;
-    Store<Entry, Long> store;
+    Store store;
     static SchemaManager schemaManager = null;
 
 
@@ -171,7 +171,7 @@ public class LessEqTest
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
         LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        LessEqCursor<String, Long> cursor = new LessEqCursor<String, Long>( store, evaluator );
+        LessEqCursor<String> cursor = new LessEqCursor<String>( store, evaluator );
         assertNotNull( cursor );
         assertFalse( cursor.available() );
         assertFalse( cursor.isClosed() );
@@ -194,27 +194,27 @@ public class LessEqTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 1L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 1 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 2L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 3L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 4L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -229,27 +229,27 @@ public class LessEqTest
         cursor.first();
 
         assertTrue( cursor.available() );
-        assertEquals( 1L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 1 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 2L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 3L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 4L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -266,27 +266,27 @@ public class LessEqTest
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( 4L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( 3L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( 2L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( 1L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 1 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -301,27 +301,27 @@ public class LessEqTest
         cursor.last();
 
         assertTrue( cursor.available() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( 4L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( 3L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( 2L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( 1L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 1 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -332,7 +332,7 @@ public class LessEqTest
         // ---------- test before() ----------
 
         cursor = new LessEqCursor( store, evaluator );
-        ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
+        ForwardIndexEntry<String> indexEntry = new ForwardIndexEntry<String>();
         indexEntry.setValue( "2" );
 
         assertFalse( cursor.available() );
@@ -341,12 +341,12 @@ public class LessEqTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 4L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -355,29 +355,29 @@ public class LessEqTest
         assertTrue( cursor.isClosed() );
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, Long>();
+        indexEntry = new ForwardIndexEntry<String>();
         indexEntry.setValue( "7" );
         cursor.before( indexEntry );
         assertFalse( cursor.available() );
         assertTrue( cursor.previous() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
         cursor.close();
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, Long>();
+        indexEntry = new ForwardIndexEntry<String>();
         indexEntry.setValue( "3" );
         cursor.before( indexEntry );
         assertFalse( cursor.available() );
         assertTrue( cursor.next() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
         cursor.close();
 
         // ---------- test after() ----------
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, Long>();
+        indexEntry = new ForwardIndexEntry<String>();
         indexEntry.setValue( "1" );
 
         assertFalse( cursor.available() );
@@ -386,12 +386,12 @@ public class LessEqTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 4L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -400,22 +400,22 @@ public class LessEqTest
         assertTrue( cursor.isClosed() );
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, Long>();
+        indexEntry = new ForwardIndexEntry<String>();
         indexEntry.setValue( "7" );
         cursor.after( indexEntry );
         assertFalse( cursor.available() );
         assertTrue( cursor.previous() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
         cursor.close();
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, Long>();
+        indexEntry = new ForwardIndexEntry<String>();
         indexEntry.setValue( "3" );
         cursor.after( indexEntry );
         assertFalse( cursor.available() );
         assertTrue( cursor.previous() );
-        assertEquals( 5L, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
         cursor.close();
     }
@@ -427,7 +427,7 @@ public class LessEqTest
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID );
         LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        LessEqCursor<String, Long> cursor = new LessEqCursor<String, Long>( store, evaluator );
+        LessEqCursor<String> cursor = new LessEqCursor<String>( store, evaluator );
         assertNotNull( cursor );
         assertFalse( cursor.available() );
         assertFalse( cursor.isClosed() );
@@ -445,21 +445,21 @@ public class LessEqTest
 
         // ---------- test beforeFirst() ----------
 
-        Set<Tuple<String, Long>> set = new HashSet<Tuple<String, Long>>();
+        Set<Tuple<String, UUID>> set = new HashSet<Tuple<String, UUID>>();
         cursor.beforeFirst();
         assertFalse( cursor.available() );
 
         while ( cursor.next() )
         {
             assertTrue( cursor.available() );
-            set.add( new Tuple<String, Long>( cursor.get().getValue(), cursor.get().getId() ) );
+            set.add( new Tuple<String, UUID>( cursor.get().getValue(), cursor.get().getId() ) );
         }
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 1L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 2L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 3L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "2", 4L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "3", 5L ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 1 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 2 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 3 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "2", StoreUtils.getUUIDString( 4 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "3", StoreUtils.getUUIDString( 5 ) ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -474,19 +474,19 @@ 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, UUID>( cursor.get().getValue(), 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, UUID>( cursor.get().getValue(), cursor.get().getId() ) );
         }
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 1L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 2L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 3L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "2", 4L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "3", 5L ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 1 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 2 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 3 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "2", StoreUtils.getUUIDString( 4 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "3", StoreUtils.getUUIDString( 5 ) ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -504,14 +504,14 @@ 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, UUID>( cursor.get().getValue(), cursor.get().getId() ) );
         }
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 1L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 2L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 3L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "2", 4L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "3", 5L ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 1 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 2 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 3 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "2", StoreUtils.getUUIDString( 4 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "3", StoreUtils.getUUIDString( 5 ) ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -523,19 +523,19 @@ 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, UUID>( cursor.get().getValue(), 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, UUID>( cursor.get().getValue(), cursor.get().getId() ) );
         }
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 1L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 2L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "1", 3L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "2", 4L ) ) );
-        assertTrue( set.contains( new Tuple<String, Long>( "3", 5L ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 1 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 2 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", StoreUtils.getUUIDString( 3 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "2", StoreUtils.getUUIDString( 4 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "3", StoreUtils.getUUIDString( 5 ) ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -543,7 +543,7 @@ public class LessEqTest
         // ---------- test before() ----------
 
         cursor = new LessEqCursor( store, evaluator );
-        ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
+        ForwardIndexEntry<String> indexEntry = new ForwardIndexEntry<String>();
         indexEntry.setValue( "2" );
         try
         {
@@ -557,7 +557,7 @@ public class LessEqTest
         // ---------- test after() ----------
 
         cursor = new LessEqCursor( store, evaluator );
-        indexEntry = new ForwardIndexEntry<String, Long>();
+        indexEntry = new ForwardIndexEntry<String>();
         indexEntry.setValue( "2" );
         try
         {
@@ -581,41 +581,41 @@ public class LessEqTest
         LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
+        ForwardIndexEntry<String> indexEntry = new ForwardIndexEntry<String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        indexEntry.setId( 1L );
+        indexEntry.setId( StoreUtils.getUUIDString( 1 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 4L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 4 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 5L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 6L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 7L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 7 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 8L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 8 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 9L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 9 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 10L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 10 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 
@@ -627,7 +627,7 @@ public class LessEqTest
         LessEqNode node = new LessEqNode( at, new StringValue( at, "2" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
+        ForwardIndexEntry<String> indexEntry = new ForwardIndexEntry<String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.STREET_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
@@ -640,12 +640,12 @@ public class LessEqTest
         attrs.add( "cn", "jane doe" );
         attrs.add( "sn", "doe" );
         attrs.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
-        attrs.add( "entryUUID", UUID.randomUUID().toString() );
+        attrs.add( "entryUUID", StoreUtils.getUUIDString( 12 ).toString() );
         
         AddOperationContext addContext = new AddOperationContext( null, attrs );
         ((Partition)store).add( addContext );
 
-        indexEntry.setId( 12L );
+        indexEntry.setId( StoreUtils.getUUIDString( 12 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
     }
 
@@ -657,13 +657,13 @@ public class LessEqTest
         LessEqNode node = new LessEqNode( at, new StringValue( at, "2" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
+        ForwardIndexEntry<String> indexEntry = new ForwardIndexEntry<String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.C_POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        indexEntry.setId( 1L );
+        indexEntry.setId( StoreUtils.getUUIDString( 1 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 
@@ -675,41 +675,41 @@ public class LessEqTest
         LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
 
         LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
-        ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String, Long>();
+        ForwardIndexEntry<String> indexEntry = new ForwardIndexEntry<String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTOFFICEBOX_AT_OID, evaluator.getAttributeType().getOid() );
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        indexEntry.setId( 1L );
+        indexEntry.setId( StoreUtils.getUUIDString( 1 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 4L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 4 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 5L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 6L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 7L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 7 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 8L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 8 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 9L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 9 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<String, Long>();
-        indexEntry.setId( 10L );
+        indexEntry = new ForwardIndexEntry<String>();
+        indexEntry.setId( StoreUtils.getUUIDString( 10 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 

Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=1199852&r1=1199851&r2=1199852&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Wed Nov  9 17:04:46 2011
@@ -28,6 +28,7 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.partition.Partition;
@@ -70,7 +71,7 @@ public class NestedFilterTest
     private static final Logger LOG = LoggerFactory.getLogger( NestedFilterTest.class.getSimpleName() );
 
     File wkdir;
-    Store<Entry, Long> store;
+    Store store;
     static SchemaManager schemaManager = null;
     EvaluatorBuilder evaluatorBuilder;
     CursorBuilder cursorBuilder;
@@ -174,21 +175,21 @@ public class NestedFilterTest
         exprNode.accept( visitor );
         optimizer.annotate( exprNode );
 
-        IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+        IndexCursor<?> cursor = cursorBuilder.build( exprNode );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 5, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 7, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() );
         assertEquals( "apache", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 9, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "apache", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -203,11 +204,11 @@ public class NestedFilterTest
         ExprNode exprNode = FilterParser.parse(schemaManager, filter);
         optimizer.annotate( exprNode );
 
-        IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+        IndexCursor<?> cursor = cursorBuilder.build( exprNode );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( 5, ( long ) cursor.get().getId() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -224,9 +225,9 @@ public class NestedFilterTest
         ExprNode exprNode = FilterParser.parse( schemaManager, filter );
         optimizer.annotate( exprNode );
 
-        IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+        IndexCursor<?> cursor = cursorBuilder.build( exprNode );
 
-        Set<Long> set = new HashSet<Long>();
+        Set<UUID> set = new HashSet<UUID>();
         while ( cursor.next() )
         {
             assertTrue( cursor.available() );
@@ -234,8 +235,8 @@ public class NestedFilterTest
             assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
         }
         assertEquals( 2, set.size() );
-        assertTrue( set.contains( 7L ) );
-        assertTrue( set.contains( 8L ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 7 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 8 ) ) );
 
         assertFalse( cursor.next() );
     }
@@ -249,6 +250,6 @@ public class NestedFilterTest
         ExprNode exprNode = FilterParser.parse( schemaManager, filter );
         optimizer.annotate( exprNode );
 
-        IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+        IndexCursor<?> cursor = cursorBuilder.build( exprNode );
     }
 }

Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1199852&r1=1199851&r2=1199852&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Wed Nov  9 17:04:46 2011
@@ -28,6 +28,7 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.partition.Partition;
@@ -74,7 +75,7 @@ public class NotCursorTest
     UuidSyntaxChecker uuidSynChecker = new UuidSyntaxChecker();
 
     File wkdir;
-    Store<Entry, Long> store;
+    Store store;
     static SchemaManager schemaManager = null;
     EvaluatorBuilder evaluatorBuilder;
     CursorBuilder cursorBuilder;
@@ -173,13 +174,13 @@ public class NotCursorTest
 
         ExprNode exprNode = FilterParser.parse( schemaManager, filter );
 
-        IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+        IndexCursor<?> cursor = cursorBuilder.build( exprNode );
 
         assertFalse( cursor.available() );
 
         cursor.beforeFirst();
 
-        Set<Long> set = new HashSet<Long>();
+        Set<UUID> set = new HashSet<UUID>();
         while ( cursor.next() )
         {
             assertTrue( cursor.available() );
@@ -187,11 +188,11 @@ public class NotCursorTest
             assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
         }
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( 1L ) );
-        assertTrue( set.contains( 2L ) );
-        assertTrue( set.contains( 3L ) );
-        assertTrue( set.contains( 4L ) );
-        assertTrue( set.contains( 7L ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 1 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 2 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 3 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 4 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 7 ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -207,14 +208,14 @@ public class NotCursorTest
         NotNode notNode = new NotNode();
 
         ExprNode exprNode = new SubstringNode( schemaManager.getAttributeType( "cn" ), "J", null );
-        Evaluator<? extends ExprNode, Entry, Long> eval = new SubstringEvaluator( (SubstringNode) exprNode, store,
+        Evaluator<? extends ExprNode> eval = new SubstringEvaluator( (SubstringNode) exprNode, store,
             schemaManager );
         notNode.addNode( exprNode );
 
-        NotCursor<String, Long> cursor = new NotCursor( store, eval ); //cursorBuilder.build( andNode );
+        NotCursor<String> cursor = new NotCursor( store, eval ); //cursorBuilder.build( andNode );
         cursor.beforeFirst();
 
-        Set<Long> set = new HashSet<Long>();
+        Set<UUID> set = new HashSet<UUID>();
         while ( cursor.next() )
         {
             assertTrue( cursor.available() );
@@ -222,11 +223,11 @@ public class NotCursorTest
             assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
         }
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( 1L ) );
-        assertTrue( set.contains( 2L ) );
-        assertTrue( set.contains( 3L ) );
-        assertTrue( set.contains( 4L ) );
-        assertTrue( set.contains( 7L ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 1 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 2 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 3 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 4 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 7 ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -241,11 +242,11 @@ public class NotCursorTest
             assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
         }
         assertEquals( 5, set.size() );
-        assertTrue( set.contains( 1L ) );
-        assertTrue( set.contains( 2L ) );
-        assertTrue( set.contains( 3L ) );
-        assertTrue( set.contains( 4L ) );
-        assertTrue( set.contains( 7L ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 1 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 2 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 3 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 4 ) ) );
+        assertTrue( set.contains( StoreUtils.getUUIDString( 7 ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -261,7 +262,7 @@ public class NotCursorTest
 
         try
         {
-            cursor.after( new ForwardIndexEntry<String, Long>() );
+            cursor.after( new ForwardIndexEntry<String>() );
             fail( "should fail with UnsupportedOperationException " );
         }
         catch ( UnsupportedOperationException uoe )
@@ -270,7 +271,7 @@ public class NotCursorTest
 
         try
         {
-            cursor.before( new ForwardIndexEntry<String, Long>() );
+            cursor.before( new ForwardIndexEntry<String>() );
             fail( "should fail with UnsupportedOperationException " );
         }
         catch ( UnsupportedOperationException uoe )

Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1199852&r1=1199851&r2=1199852&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Wed Nov  9 17:04:46 2011
@@ -71,7 +71,7 @@ public class OneLevelScopeTest
     public static final Logger LOG = LoggerFactory.getLogger( OneLevelScopeTest.class );
 
     File wkdir;
-    Store<Entry, Long> store;
+    Store store;
     static SchemaManager schemaManager = null;
 
 
@@ -126,8 +126,8 @@ public class OneLevelScopeTest
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( true );
 
-        store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
         ((Partition)store).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
         ((Partition)store).initialize();
 
@@ -161,9 +161,9 @@ public class OneLevelScopeTest
     {
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
-        OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator );
 
         // --------- Test beforeFirst() ---------
 
@@ -172,46 +172,47 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<Long, Long> indexEntry = cursor.get();
+        IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 5L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test first() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.first();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 5L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test afterLast() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         cursor.afterLast();
         assertFalse( cursor.available() );
 
@@ -219,81 +220,82 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 5L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test last() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.last();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 5L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test previous() before positioning ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.previous();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 5L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test next() before positioning ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.next();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 5L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 2L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -305,9 +307,9 @@ public class OneLevelScopeTest
     {
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
-        OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator );
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();
@@ -315,46 +317,46 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<Long, Long> indexEntry = cursor.get();
+        IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 11L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test first() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.first();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 11L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test afterLast() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         cursor.afterLast();
         assertFalse( cursor.available() );
 
@@ -362,81 +364,81 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 11L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
-
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test last() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.last();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 11L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test previous() before positioning ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.previous();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 11L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test next() before positioning ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.next();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 11L, ( long ) indexEntry.getId() );
-        assertEquals( 4L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -448,9 +450,9 @@ public class OneLevelScopeTest
     {
         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 );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
-        OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator );
 
         // --------- Test beforeFirst() ---------
 
@@ -459,46 +461,46 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<Long, Long> indexEntry = cursor.get();
+        IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test first() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.first();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test afterLast() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         cursor.afterLast();
         assertFalse( cursor.available() );
 
@@ -506,59 +508,59 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test last() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.last();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test previous() before positioning ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.previous();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -571,9 +573,9 @@ public class OneLevelScopeTest
         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 );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
-        OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator );
 
         // --------- Test beforeFirst() ---------
 
@@ -582,32 +584,32 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<Long, Long> indexEntry = cursor.get();
+        IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 7L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test first() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.first();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 7L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test afterLast() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         cursor.afterLast();
         assertFalse( cursor.available() );
 
@@ -615,38 +617,38 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 7L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test last() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.last();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 7L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test previous() before positioning ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.previous();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 7L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -664,7 +666,7 @@ public class OneLevelScopeTest
         entry.add( "cn", "jd" );
         entry.add( "aliasedObjectName", "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
-        entry.add( "entryUUID", UUID.randomUUID().toString() );
+        entry.add( "entryUUID", StoreUtils.getUUIDString( 12 ).toString() );
 
         AddOperationContext addContext = new AddOperationContext( null, entry );
         ((Partition)store).add( addContext );
@@ -677,16 +679,16 @@ public class OneLevelScopeTest
         entry.add( "cn", "jdoe" );
         entry.add( "sn", "doe" );
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
-        entry.add( "entryUUID", UUID.randomUUID().toString() );
+        entry.add( "entryUUID", StoreUtils.getUUIDString( 13 ).toString() );
         
         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 );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
-        OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator );
 
         // --------- Test beforeFirst() ---------
 
@@ -695,74 +697,72 @@ public class OneLevelScopeTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        IndexEntry<Long, Long> indexEntry = cursor.get();
+        IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 13L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test first() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.first();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 13L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
-
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
-
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
         // --------- Test afterLast() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         cursor.afterLast();
         assertFalse( cursor.available() );
 
@@ -770,137 +770,137 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 13L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test last() ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.last();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 13L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test previous() before positioning ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.previous();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 13L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
-
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
         // --------- Test next() before positioning ---------
 
-        cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        cursor = new OneLevelScopeCursor( store, evaluator );
         assertFalse( cursor.available() );
         cursor.next();
 
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 7L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 13L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 6L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( 8L, ( long ) indexEntry.getId() );
-        assertEquals( 3L, ( long ) indexEntry.getValue() );
+        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -912,11 +912,11 @@ public class OneLevelScopeTest
     {
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
 
-        ForwardIndexEntry<Long, Long> indexEntry = new ForwardIndexEntry<Long, Long>();
-        indexEntry.setId( 6L );
+        ForwardIndexEntry<UUID> indexEntry = new ForwardIndexEntry<UUID>();
+        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
     }
 
@@ -926,7 +926,7 @@ public class OneLevelScopeTest
     {
         ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, new Dn( SchemaConstants.OU_AT_OID
             + "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
         assertEquals( node, evaluator.getExpression() );
 
@@ -935,20 +935,20 @@ public class OneLevelScopeTest
          * will not accept an alias candidate because aliases are not returned
          * when alias dereferencing while searching is enabled.
          */
-        ForwardIndexEntry<Long, Long> indexEntry = new ForwardIndexEntry<Long, Long>();
-        indexEntry.setId( 11L );
+        ForwardIndexEntry<UUID> indexEntry = new ForwardIndexEntry<UUID>();
+        indexEntry.setId( StoreUtils.getUUIDString( 11 ));
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<Long, Long>();
-        indexEntry.setId( 8L );
+        indexEntry = new ForwardIndexEntry<UUID>();
+        indexEntry.setId( StoreUtils.getUUIDString( 8 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<Long, Long>();
-        indexEntry.setId( 5L );
+        indexEntry = new ForwardIndexEntry<UUID>();
+        indexEntry.setId( StoreUtils.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<Long, Long>();
-        indexEntry.setId( 6L );
+        indexEntry = new ForwardIndexEntry<UUID>();
+        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 
@@ -958,9 +958,9 @@ public class OneLevelScopeTest
     {
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
-        OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator );
         cursor.get();
     }
 
@@ -970,13 +970,13 @@ public class OneLevelScopeTest
     {
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
-        OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator );
 
         // test before()
-        ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
-        entry.setValue( 3L );
+        ForwardIndexEntry<UUID> entry = new ForwardIndexEntry<UUID>();
+        entry.setValue( StoreUtils.getUUIDString( 3 ) );
         cursor.before( entry );
     }
 
@@ -986,13 +986,13 @@ public class OneLevelScopeTest
     {
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
-        OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
+        OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store,
             node );
-        OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
+        OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator );
 
         // test after()
-        ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
-        entry.setValue( 3L );
+        ForwardIndexEntry<UUID> entry = new ForwardIndexEntry<UUID>();
+        entry.setValue( StoreUtils.getUUIDString( 3 ) );
         cursor.after( entry );
     }
 
@@ -1002,6 +1002,6 @@ public class OneLevelScopeTest
     {
         ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
-        new OneLevelScopeEvaluator<Entry, Long>( store, node );
+        new OneLevelScopeEvaluator( store, node );
     }
 }
\ No newline at end of file



Mime
View raw message