directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1200292 [2/3] - in /directory: apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ apacheds/branches/apacheds-txns/jdbm-partition/src/main/java/org/apache/directory/server/core/parti...
Date Thu, 10 Nov 2011 12:30:00 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=1200292&r1=1200291&r2=1200292&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 Thu Nov 10 12:29:58 2011
@@ -39,7 +39,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
 import org.apache.directory.server.core.api.partition.index.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.XdbmStoreUtils;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.csn.CsnFactory;
@@ -60,6 +60,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.Strings;
 import org.apache.directory.shared.util.exception.Exceptions;
 import org.junit.After;
 import org.junit.Before;
@@ -142,7 +143,7 @@ public class LessEqTest
 
         ((Partition)store).initialize();
 
-        StoreUtils.loadExampleData( store, schemaManager );
+        XdbmStoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );
     }
 
@@ -194,27 +195,27 @@ public class LessEqTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 1 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 1 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 3 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -229,27 +230,27 @@ public class LessEqTest
         cursor.first();
 
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 1 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 1 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 3 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -266,27 +267,27 @@ public class LessEqTest
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 3 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 1 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 1 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -301,27 +302,27 @@ public class LessEqTest
         cursor.last();
 
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 3 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 1 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 1 ), cursor.get().getId() );
         assertEquals( "1", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -341,12 +342,12 @@ public class LessEqTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -360,7 +361,7 @@ public class LessEqTest
         cursor.before( indexEntry );
         assertFalse( cursor.available() );
         assertTrue( cursor.previous() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
         cursor.close();
 
@@ -370,7 +371,7 @@ public class LessEqTest
         cursor.before( indexEntry );
         assertFalse( cursor.available() );
         assertTrue( cursor.next() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
         cursor.close();
 
@@ -386,12 +387,12 @@ public class LessEqTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 4 ), cursor.get().getId() );
         assertEquals( "2", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -405,7 +406,7 @@ public class LessEqTest
         cursor.after( indexEntry );
         assertFalse( cursor.available() );
         assertTrue( cursor.previous() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
         cursor.close();
 
@@ -415,7 +416,7 @@ public class LessEqTest
         cursor.after( indexEntry );
         assertFalse( cursor.available() );
         assertTrue( cursor.previous() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "3", cursor.get().getValue() );
         cursor.close();
     }
@@ -455,11 +456,11 @@ public class LessEqTest
             set.add( new Tuple<String, UUID>( cursor.get().getValue(), cursor.get().getId() ) );
         }
         assertEquals( 5, set.size() );
-        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 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 1 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 2 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 3 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "2", Strings.getUUIDString( 4 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUIDString( 5 ) ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -482,11 +483,11 @@ public class LessEqTest
             set.add( new Tuple<String, UUID>( cursor.get().getValue(), cursor.get().getId() ) );
         }
         assertEquals( 5, set.size() );
-        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 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 1 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 2 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 3 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "2", Strings.getUUIDString( 4 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUIDString( 5 ) ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -507,11 +508,11 @@ public class LessEqTest
             set.add( new Tuple<String, UUID>( cursor.get().getValue(), cursor.get().getId() ) );
         }
         assertEquals( 5, set.size() );
-        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 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 1 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 2 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 3 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "2", Strings.getUUIDString( 4 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUIDString( 5 ) ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -531,11 +532,11 @@ public class LessEqTest
             set.add( new Tuple<String, UUID>( cursor.get().getValue(), cursor.get().getId() ) );
         }
         assertEquals( 5, set.size() );
-        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 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 1 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 2 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "1", Strings.getUUIDString( 3 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "2", Strings.getUUIDString( 4 ) ) ) );
+        assertTrue( set.contains( new Tuple<String, UUID>( "3", Strings.getUUIDString( 5 ) ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -587,35 +588,35 @@ public class LessEqTest
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        indexEntry.setId( StoreUtils.getUUIDString( 1 ) );
+        indexEntry.setId( Strings.getUUIDString( 1 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 4 ) );
+        indexEntry.setId( Strings.getUUIDString( 4 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 5 ) );
+        indexEntry.setId( Strings.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 7 ) );
+        indexEntry.setId( Strings.getUUIDString( 7 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 8 ) );
+        indexEntry.setId( Strings.getUUIDString( 8 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 9 ) );
+        indexEntry.setId( Strings.getUUIDString( 9 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 10 ) );
+        indexEntry.setId( Strings.getUUIDString( 10 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 
@@ -640,12 +641,12 @@ public class LessEqTest
         attrs.add( "cn", "jane doe" );
         attrs.add( "sn", "doe" );
         attrs.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
-        attrs.add( "entryUUID", StoreUtils.getUUIDString( 12 ).toString() );
+        attrs.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
         
         AddOperationContext addContext = new AddOperationContext( null, attrs );
         ((Partition)store).add( addContext );
 
-        indexEntry.setId( StoreUtils.getUUIDString( 12 ) );
+        indexEntry.setId( Strings.getUUIDString( 12 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
     }
 
@@ -663,7 +664,7 @@ public class LessEqTest
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        indexEntry.setId( StoreUtils.getUUIDString( 1 ) );
+        indexEntry.setId( Strings.getUUIDString( 1 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 
@@ -681,35 +682,35 @@ public class LessEqTest
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        indexEntry.setId( StoreUtils.getUUIDString( 1 ) );
+        indexEntry.setId( Strings.getUUIDString( 1 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 4 ) );
+        indexEntry.setId( Strings.getUUIDString( 4 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 5 ) );
+        indexEntry.setId( Strings.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 7 ) );
+        indexEntry.setId( Strings.getUUIDString( 7 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 8 ) );
+        indexEntry.setId( Strings.getUUIDString( 8 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 9 ) );
+        indexEntry.setId( Strings.getUUIDString( 9 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 10 ) );
+        indexEntry.setId( Strings.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=1200292&r1=1200291&r2=1200292&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 Thu Nov 10 12:29:58 2011
@@ -35,7 +35,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
 import org.apache.directory.server.core.api.partition.index.IndexCursor;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.XdbmStoreUtils;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -51,6 +51,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.Strings;
 import org.apache.directory.shared.util.exception.Exceptions;
 import org.junit.After;
 import org.junit.Before;
@@ -138,7 +139,7 @@ public class NestedFilterTest
         ((Partition)store).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) );
         ((Partition)store).initialize();
 
-        StoreUtils.loadExampleData( store, schemaManager );
+        XdbmStoreUtils.loadExampleData( store, schemaManager );
 
         evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
         cursorBuilder = new CursorBuilder( store, evaluatorBuilder );
@@ -179,17 +180,17 @@ public class NestedFilterTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() );
         assertEquals( "apache", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "apache", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -208,7 +209,7 @@ public class NestedFilterTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -235,8 +236,8 @@ public class NestedFilterTest
             assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
         }
         assertEquals( 2, set.size() );
-        assertTrue( set.contains( StoreUtils.getUUIDString( 7 ) ) );
-        assertTrue( set.contains( StoreUtils.getUUIDString( 8 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 7 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 8 ) ) );
 
         assertFalse( cursor.next() );
     }

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=1200292&r1=1200291&r2=1200292&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 Thu Nov 10 12:29:58 2011
@@ -36,7 +36,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.partition.index.ForwardIndexEntry;
 import org.apache.directory.server.core.api.partition.index.IndexCursor;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.XdbmStoreUtils;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -53,6 +53,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.Strings;
 import org.apache.directory.shared.util.exception.Exceptions;
 import org.junit.After;
 import org.junit.Before;
@@ -139,7 +140,7 @@ public class NotCursorTest
 
         ((Partition)store).initialize();
         
-        StoreUtils.loadExampleData( store, schemaManager );
+        XdbmStoreUtils.loadExampleData( store, schemaManager );
 
         evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
         cursorBuilder = new CursorBuilder( store, evaluatorBuilder );
@@ -188,11 +189,11 @@ public class NotCursorTest
             assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
         }
         assertEquals( 5, set.size() );
-        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 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 1 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 2 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 3 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 4 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 7 ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -223,11 +224,11 @@ public class NotCursorTest
             assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
         }
         assertEquals( 5, set.size() );
-        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 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 1 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 2 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 3 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 4 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 7 ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -242,11 +243,11 @@ public class NotCursorTest
             assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getValue() ) );
         }
         assertEquals( 5, set.size() );
-        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 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 1 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 2 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 3 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 4 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 7 ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );

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=1200292&r1=1200291&r2=1200292&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 Thu Nov 10 12:29:58 2011
@@ -36,7 +36,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.partition.index.ForwardIndexEntry;
 import org.apache.directory.server.core.api.partition.index.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.XdbmStoreUtils;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.csn.CsnFactory;
@@ -52,6 +52,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.Strings;
 import org.apache.directory.shared.util.exception.Exceptions;
 import org.junit.After;
 import org.junit.Before;
@@ -133,7 +134,7 @@ public class OneLevelScopeTest
 
         ((Partition)store).initialize();
 
-        StoreUtils.loadExampleData( store, schemaManager );
+        XdbmStoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );
     }
 
@@ -174,15 +175,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -196,15 +197,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
 
         assertFalse( cursor.next() );
@@ -220,16 +221,16 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -243,15 +244,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -265,15 +266,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -287,15 +288,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -319,15 +320,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -341,15 +342,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -364,15 +365,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
         
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -386,15 +387,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -408,15 +409,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -430,15 +431,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 11 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 11 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 4 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -463,15 +464,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -485,15 +486,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -508,15 +509,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -530,15 +531,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -552,15 +553,15 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -586,8 +587,8 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -601,8 +602,8 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -617,8 +618,8 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -632,8 +633,8 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -647,8 +648,8 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -666,7 +667,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", StoreUtils.getUUIDString( 12 ).toString() );
+        entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
 
         AddOperationContext addContext = new AddOperationContext( null, entry );
         ((Partition)store).add( addContext );
@@ -679,7 +680,7 @@ public class OneLevelScopeTest
         entry.add( "cn", "jdoe" );
         entry.add( "sn", "doe" );
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
-        entry.add( "entryUUID", StoreUtils.getUUIDString( 13 ).toString() );
+        entry.add( "entryUUID", Strings.getUUIDString( 13 ).toString() );
         
         addContext = new AddOperationContext( null, entry );
         ((Partition)store).add( addContext );
@@ -699,29 +700,29 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -735,28 +736,28 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
@@ -770,29 +771,29 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -806,29 +807,29 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -842,29 +843,29 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
         
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -878,29 +879,29 @@ public class OneLevelScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -916,7 +917,7 @@ public class OneLevelScopeTest
             node );
 
         ForwardIndexEntry<UUID> indexEntry = new ForwardIndexEntry<UUID>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
     }
 
@@ -936,19 +937,19 @@ public class OneLevelScopeTest
          * when alias dereferencing while searching is enabled.
          */
         ForwardIndexEntry<UUID> indexEntry = new ForwardIndexEntry<UUID>();
-        indexEntry.setId( StoreUtils.getUUIDString( 11 ));
+        indexEntry.setId( Strings.getUUIDString( 11 ));
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<UUID>();
-        indexEntry.setId( StoreUtils.getUUIDString( 8 ) );
+        indexEntry.setId( Strings.getUUIDString( 8 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<UUID>();
-        indexEntry.setId( StoreUtils.getUUIDString( 5 ) );
+        indexEntry.setId( Strings.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<UUID>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 
@@ -976,7 +977,7 @@ public class OneLevelScopeTest
 
         // test before()
         ForwardIndexEntry<UUID> entry = new ForwardIndexEntry<UUID>();
-        entry.setValue( StoreUtils.getUUIDString( 3 ) );
+        entry.setValue( Strings.getUUIDString( 3 ) );
         cursor.before( entry );
     }
 
@@ -992,7 +993,7 @@ public class OneLevelScopeTest
 
         // test after()
         ForwardIndexEntry<UUID> entry = new ForwardIndexEntry<UUID>();
-        entry.setValue( StoreUtils.getUUIDString( 3 ) );
+        entry.setValue( Strings.getUUIDString( 3 ) );
         cursor.after( entry );
     }
 

Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Thu Nov 10 12:29:58 2011
@@ -36,7 +36,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.partition.index.IndexCursor;
 import org.apache.directory.server.core.api.partition.index.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.XdbmStoreUtils;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -53,6 +53,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.Strings;
 import org.apache.directory.shared.util.exception.Exceptions;
 import org.junit.After;
 import org.junit.Before;
@@ -140,7 +141,7 @@ public class OrCursorTest
 
         ((Partition)store).initialize();
 
-        StoreUtils.loadExampleData( store, schemaManager );
+        XdbmStoreUtils.loadExampleData( store, schemaManager );
 
         evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
         cursorBuilder = new CursorBuilder( store, evaluatorBuilder );
@@ -180,32 +181,32 @@ public class OrCursorTest
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertEquals( "jack daniels", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -215,32 +216,32 @@ public class OrCursorTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertEquals( "jack daniels", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -292,32 +293,32 @@ public class OrCursorTest
         // from first
         assertTrue( cursor.first() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertEquals( "jack daniels", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -329,32 +330,32 @@ public class OrCursorTest
 
         assertTrue( cursor.last() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertEquals( "jack daniels", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );

Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Thu Nov 10 12:29:58 2011
@@ -37,7 +37,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
 import org.apache.directory.server.core.api.partition.index.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.XdbmStoreUtils;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
@@ -49,6 +49,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.Strings;
 import org.apache.directory.shared.util.exception.Exceptions;
 import org.junit.After;
 import org.junit.Before;
@@ -129,7 +130,7 @@ public class PresenceTest
 
         ((Partition)store).initialize();
 
-        StoreUtils.loadExampleData( store, schemaManager );
+        XdbmStoreUtils.loadExampleData( store, schemaManager );
         
         LOG.debug( "Created new store" );
     }
@@ -165,22 +166,22 @@ public class PresenceTest
         cursor.beforeFirst();
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
@@ -230,31 +231,31 @@ public class PresenceTest
         cursor.beforeFirst();
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 3 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 4 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 4 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
@@ -313,9 +314,9 @@ public class PresenceTest
             set.add( cursor.get().getId() );
         }
         assertEquals( 3, set.size() );
-        assertTrue( set.contains( StoreUtils.getUUIDString( 5 ) ) );
-        assertTrue( set.contains( StoreUtils.getUUIDString( 6 ) ) );
-        assertTrue( set.contains( StoreUtils.getUUIDString( 8 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 5 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 6 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 8 ) ) );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -349,9 +350,9 @@ public class PresenceTest
             set.add( cursor.get().getId() );
         }
         assertEquals( 3, set.size() );
-        assertTrue( set.contains( StoreUtils.getUUIDString( 5 ) ) );
-        assertTrue( set.contains( StoreUtils.getUUIDString( 6 ) ) );
-        assertTrue( set.contains( StoreUtils.getUUIDString( 8 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 5 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 6 ) ) );
+        assertTrue( set.contains( Strings.getUUIDString( 8 ) ) );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -365,7 +366,7 @@ public class PresenceTest
         cursor.beforeFirst();
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 1 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 1 ), cursor.get().getId() );
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
 
@@ -382,11 +383,11 @@ public class PresenceTest
         PresenceEvaluator evaluator = new PresenceEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String> entry = new ForwardIndexEntry<String>();
         entry.setValue( SchemaConstants.CN_AT_OID );
-        entry.setId( StoreUtils.getUUIDString( 3 ) );
+        entry.setId( Strings.getUUIDString( 3 ) );
         assertFalse( evaluator.evaluate( entry ) );
         entry = new ForwardIndexEntry<String>();
         entry.setValue( SchemaConstants.CN_AT_OID );
-        entry.setId( StoreUtils.getUUIDString( 5 ) );
+        entry.setId( Strings.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( entry ) );
     }
 
@@ -412,7 +413,7 @@ public class PresenceTest
 
         entry = new ForwardIndexEntry<String>();
         entry.setValue( oid );
-        entry.setId( StoreUtils.getUUIDString( 5 ) );
+        entry.setId( Strings.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( entry ) );
     }
 
@@ -424,35 +425,35 @@ public class PresenceTest
         PresenceEvaluator evaluator = new PresenceEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String> entry = new ForwardIndexEntry<String>();
         entry.setValue( SchemaConstants.NAME_AT_OID );
-        entry.setId( StoreUtils.getUUIDString( 3 ) );
+        entry.setId( Strings.getUUIDString( 3 ) );
         assertTrue( evaluator.evaluate( entry ) );
         entry = new ForwardIndexEntry<String>();
         entry.setValue( SchemaConstants.NAME_AT_OID );
-        entry.setId( StoreUtils.getUUIDString( 5 ) );
+        entry.setId( Strings.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( entry ) );
 
         node = new PresenceNode( schemaManager.getAttributeType( "searchGuide" ) );
         evaluator = new PresenceEvaluator( node, store, schemaManager );
         entry = new ForwardIndexEntry<String>();
         entry.setValue( SchemaConstants.SEARCHGUIDE_AT_OID );
-        entry.setId( StoreUtils.getUUIDString( 3 ) );
+        entry.setId( Strings.getUUIDString( 3 ) );
         assertFalse( evaluator.evaluate( entry ) );
         entry = new ForwardIndexEntry<String>();
         entry.setValue( SchemaConstants.SEARCHGUIDE_AT_OID );
-        entry.setId( StoreUtils.getUUIDString( 5 ) );
-        entry.setEntry( store.lookup( StoreUtils.getUUIDString( 5 ) ) );
+        entry.setId( Strings.getUUIDString( 5 ) );
+        entry.setEntry( store.lookup( Strings.getUUIDString( 5 ) ) );
         assertFalse( evaluator.evaluate( entry ) );
 
         node = new PresenceNode( schemaManager.getAttributeType( "st" ) );
         evaluator = new PresenceEvaluator( node, store, schemaManager );
         entry = new ForwardIndexEntry<String>();
         entry.setValue( SchemaConstants.ST_AT_OID );
-        entry.setId( StoreUtils.getUUIDString( 3 ) );
+        entry.setId( Strings.getUUIDString( 3 ) );
         assertFalse( evaluator.evaluate( entry ) );
         entry = new ForwardIndexEntry<String>();
         entry.setValue( SchemaConstants.ST_AT_OID );
-        entry.setId( StoreUtils.getUUIDString( 5 ) );
-        entry.setEntry( store.lookup( StoreUtils.getUUIDString(53 ) ) );
+        entry.setId( Strings.getUUIDString( 5 ) );
+        entry.setEntry( store.lookup( Strings.getUUIDString(53 ) ) );
         assertFalse( evaluator.evaluate( entry ) );
     }
 



Mime
View raw message