Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A7BAE9C10 for ; Thu, 10 Nov 2011 12:30:25 +0000 (UTC) Received: (qmail 92330 invoked by uid 500); 10 Nov 2011 12:30:25 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 92294 invoked by uid 500); 10 Nov 2011 12:30:25 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 92287 invoked by uid 99); 10 Nov 2011 12:30:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 12:30:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 12:30:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 90BFD23889CB for ; Thu, 10 Nov 2011 12:30:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1200292 [1/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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111110123001.90BFD23889CB@eris.apache.org> Author: elecharny Date: Thu Nov 10 12:29:58 2011 New Revision: 1200292 URL: http://svn.apache.org/viewvc?rev=1200292&view=rev Log: o Cleanup some imports o Switched the EQUALITY and ORDERING to uuidMatch for index o Moved the getUUIDString methods to Strings, otherwise the server does not compile, as the StoreUtils class is in a test and not included into the jdbm-partition jar o Renamed the StoreUtils to XdbmStoreUtils to avoid a collision with a Kerberos StoreUtils class Added: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/XdbmStoreUtils.java - copied, changed from r1200224, directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java Removed: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java directory/apacheds/branches/apacheds-txns/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java directory/apacheds/branches/apacheds-txns/server-integ/pom.xml directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/IndexTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.400.ldif directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.43.ldif directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif directory/shared/branches/shared-txns/util/src/main/java/org/apache/directory/shared/util/Strings.java Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java?rev=1200292&r1=1200291&r2=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java (original) +++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java Thu Nov 10 12:29:58 2011 @@ -20,7 +20,6 @@ package org.apache.directory.server.core.api.partition.index; import java.util.Comparator; -import java.util.UUID; public interface IndexComparator extends Comparator> { Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java?rev=1200292&r1=1200291&r2=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java (original) +++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java Thu Nov 10 12:29:58 2011 @@ -21,7 +21,6 @@ package org.apache.directory.server.core import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -import org.apache.directory.shared.ldap.model.entry.Entry; /** Modified: directory/apacheds/branches/apacheds-txns/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1200292&r1=1200291&r2=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original) +++ directory/apacheds/branches/apacheds-txns/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Thu Nov 10 12:29:58 2011 @@ -24,7 +24,6 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.net.URI; -import java.util.Comparator; import java.util.UUID; import jdbm.RecordManager; @@ -33,7 +32,6 @@ import jdbm.recman.SnapshotRecordManager import org.apache.directory.server.constants.ApacheSchemaConstants; import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor; -import org.apache.directory.server.core.partition.impl.btree.LongComparator; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.core.api.partition.index.AbstractIndex; import org.apache.directory.server.core.api.partition.index.ForwardIndexComparator; Modified: directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1200292&r1=1200291&r2=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original) +++ directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Thu Nov 10 12:29:58 2011 @@ -41,7 +41,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.partition.index.IndexEntry; import org.apache.directory.server.core.api.partition.index.IndexNotFoundException; 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.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.cursor.Cursor; @@ -62,6 +62,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; @@ -161,7 +162,7 @@ public class JdbmStoreTest store.initialize(); - StoreUtils.loadExampleData( store, schemaManager ); + XdbmStoreUtils.loadExampleData( store, schemaManager ); LOG.debug( "Created new store" ); } @@ -216,7 +217,7 @@ public class JdbmStoreTest entry.add( "objectClass", "top", "domain" ); entry.add( "dc", "example" ); entry.add( SchemaConstants.ENTRY_CSN_AT, new CsnFactory( 0 ).newInstance().toString() ); - entry.add( SchemaConstants.ENTRY_UUID_AT, StoreUtils.getUUIDString( 1 ).toString() ); + entry.add( SchemaConstants.ENTRY_UUID_AT, Strings.getUUIDString( 1 ).toString() ); store2.add( new AddOperationContext( null, entry ) ); // lookup the context entry @@ -489,36 +490,36 @@ public class JdbmStoreTest public void testFreshStore() throws Exception { Dn dn = new Dn( schemaManager, "o=Good Times Co." ); - assertEquals( StoreUtils.getUUIDString( 1 ), store.getEntryId( dn ) ); + assertEquals( Strings.getUUIDString( 1 ), store.getEntryId( dn ) ); assertEquals( 11, store.count() ); - assertEquals( "o=Good Times Co.", store.getEntryDn( StoreUtils.getUUIDString( 1 ) ).getName() ); - assertEquals( dn.getNormName(), store.getEntryDn( StoreUtils.getUUIDString( 1 ) ).getNormName() ); - assertEquals( dn.getName(), store.getEntryDn( StoreUtils.getUUIDString( 1 ) ).getName() ); + assertEquals( "o=Good Times Co.", store.getEntryDn( Strings.getUUIDString( 1 ) ).getName() ); + assertEquals( dn.getNormName(), store.getEntryDn( Strings.getUUIDString( 1 ) ).getNormName() ); + assertEquals( dn.getName(), store.getEntryDn( Strings.getUUIDString( 1 ) ).getName() ); // note that the suffix entry returns 0 for it's parent which does not exist - assertEquals( StoreUtils.getUUIDString( 0 ), store.getParentId( store.getEntryId( dn ) ) ); - assertNull( store.getParentId( StoreUtils.getUUIDString( 0 ) ) ); + assertEquals( Strings.getUUIDString( 0 ), store.getParentId( store.getEntryId( dn ) ) ); + assertNull( store.getParentId( Strings.getUUIDString( 0 ) ) ); // should NOW be allowed - store.delete( StoreUtils.getUUIDString( 1 ) ); + store.delete( Strings.getUUIDString( 1 ) ); } @Test public void testEntryOperations() throws Exception { - assertEquals( 3, store.getChildCount( StoreUtils.getUUIDString( 1 ) ) ); + assertEquals( 3, store.getChildCount( Strings.getUUIDString( 1 ) ) ); - Cursor> cursor = store.list( StoreUtils.getUUIDString( 1 ) ); + Cursor> cursor = store.list( Strings.getUUIDString( 1 ) ); assertNotNull( cursor ); cursor.beforeFirst(); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() ); assertTrue( cursor.next() ); - assertEquals( 3, store.getChildCount( StoreUtils.getUUIDString( 1 ) ) ); + assertEquals( 3, store.getChildCount( Strings.getUUIDString( 1 ) ) ); - store.delete( StoreUtils.getUUIDString( 2 ) ); - assertEquals( 2, store.getChildCount( StoreUtils.getUUIDString( 1 ) ) ); + store.delete( Strings.getUUIDString( 2 ) ); + assertEquals( 2, store.getChildCount( Strings.getUUIDString( 1 ) ) ); assertEquals( 10, store.count() ); // add an alias and delete to test dropAliasIndices method @@ -529,12 +530,12 @@ public class JdbmStoreTest entry.add( "commonName", "Jack Daniels" ); 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 ); store.add( addContext ); - store.delete( StoreUtils.getUUIDString( 12 ) ); // drops the alias indices + store.delete( Strings.getUUIDString( 12 ) ); // drops the alias indices } @@ -546,28 +547,28 @@ public class JdbmStoreTest assertEquals( 19, idx.count() ); - Cursor> cursor = idx.forwardCursor( StoreUtils.getUUIDString( 2 ) ); + Cursor> cursor = idx.forwardCursor( Strings.getUUIDString( 2 ) ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() ); assertFalse( cursor.next() ); - idx.drop( StoreUtils.getUUIDString( 5 ) ); + idx.drop( Strings.getUUIDString( 5 ) ); - cursor = idx.forwardCursor( StoreUtils.getUUIDString( 2 ) ); + cursor = idx.forwardCursor( Strings.getUUIDString( 2 ) ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() ); assertFalse( cursor.next() ); @@ -578,24 +579,24 @@ public class JdbmStoreTest entry.add( "ou", "Sales" ); entry.add( "cn", "Martin King" ); 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 ); store.add( addContext ); - cursor = idx.forwardCursor( StoreUtils.getUUIDString( 2 ) ); + cursor = idx.forwardCursor( Strings.getUUIDString( 2 ) ); cursor.afterLast(); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 12 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 12 ), cursor.get().getId() ); Dn newParentDn = new Dn( schemaManager, "ou=Board of Directors,o=Good Times Co." ); Dn newDn = newParentDn.add( martinDn.getRdn() ); store.move( martinDn, newParentDn, newDn, entry ); - cursor = idx.forwardCursor( StoreUtils.getUUIDString( 3 ) ); + cursor = idx.forwardCursor( Strings.getUUIDString( 3 ) ); cursor.afterLast(); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 12 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 12 ), cursor.get().getId() ); // dn id 13 Dn marketingDn = new Dn( schemaManager, "ou=Marketing,ou=Sales,o=Good Times Co." ); @@ -603,7 +604,7 @@ public class JdbmStoreTest entry.add( "objectClass", "top", "organizationalUnit" ); entry.add( "ou", "Marketing" ); 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 ); store.add( addContext ); @@ -614,7 +615,7 @@ public class JdbmStoreTest entry.add( "ou", "Marketing" ); entry.add( "cn", "Jimmy Wales" ); entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() ); - entry.add( "entryUUID", StoreUtils.getUUIDString( 14 ).toString() ); + entry.add( "entryUUID", Strings.getUUIDString( 14 ).toString() ); addContext = new AddOperationContext( null, entry ); store.add( addContext ); @@ -622,29 +623,29 @@ public class JdbmStoreTest store.move( marketingDn, newParentDn, newDn, entry ); - cursor = idx.forwardCursor( StoreUtils.getUUIDString( 3 ) ); + cursor = idx.forwardCursor( Strings.getUUIDString( 3 ) ); cursor.afterLast(); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 14 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 14 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 13 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 13 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 12 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 12 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() );; + assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() );; assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 3 ), cursor.get().getId() ); assertFalse( cursor.previous() ); } @@ -679,7 +680,7 @@ public class JdbmStoreTest entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "ou", "Not Present" ); entry.add( "cn", "Martin King" ); - entry.add( "entryUUID", StoreUtils.getUUIDString( 12 ).toString() ); + entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() ); AddOperationContext addContext = new AddOperationContext( null, entry ); store.add( addContext ); } @@ -692,7 +693,7 @@ public class JdbmStoreTest Entry entry = new DefaultEntry( schemaManager, dn ); entry.add( "ou", "Sales" ); entry.add( "cn", "Martin King" ); - entry.add( "entryUUID", StoreUtils.getUUIDString( 12 ).toString() ); + entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() ); AddOperationContext addContext = new AddOperationContext( null, entry ); store.add( addContext ); } @@ -721,7 +722,7 @@ public class JdbmStoreTest entry.add( "ou", "Engineering" ); entry.add( "cn", "Private Ryan" ); 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 ); store.add( addContext ); @@ -746,7 +747,7 @@ public class JdbmStoreTest entry.add( "ou", "Engineering" ); entry.add( "cn", "Private Ryan" ); 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 ); store.add( addContext ); @@ -772,7 +773,7 @@ public class JdbmStoreTest childEntry.add( "ou", "Engineering" ); childEntry.add( "cn", "Private Ryan" ); childEntry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() ); - childEntry.add( "entryUUID", StoreUtils.getUUIDString( 12 ).toString() ); + childEntry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() ); AddOperationContext addContext = new AddOperationContext( null, childEntry ); store.add( addContext ); @@ -880,7 +881,7 @@ public class JdbmStoreTest entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "cn", "Tim B" ); 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 ); store.add( addContext ); Modified: directory/apacheds/branches/apacheds-txns/server-integ/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/server-integ/pom.xml?rev=1200292&r1=1200291&r2=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/server-integ/pom.xml (original) +++ directory/apacheds/branches/apacheds-txns/server-integ/pom.xml Thu Nov 10 12:29:58 2011 @@ -86,6 +86,11 @@ ${project.groupId} + apacheds-xdbm-partition + + + + ${project.groupId} apacheds-test-framework Modified: directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/IndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/IndexTest.java?rev=1200292&r1=1200291&r2=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/IndexTest.java (original) +++ directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/IndexTest.java Thu Nov 10 12:29:58 2011 @@ -30,16 +30,15 @@ import java.util.UUID; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.api.partition.index.Index; import org.apache.directory.server.core.api.partition.index.IndexCursor; -import org.apache.directory.server.xdbm.StoreUtils; 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.entry.Entry; import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; 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.Before; import org.junit.BeforeClass; @@ -122,7 +121,7 @@ public class IndexTest for ( int i = 0; i < 26; i++ ) { String val = alphabet.substring( i, (i+1) ); - idx.add( val, StoreUtils.getUUIDString( i + 1 ) ); + idx.add( val, Strings.getUUIDString( i + 1 ) ); } assertEquals( 26, idx.count() ); @@ -130,10 +129,10 @@ public class IndexTest IndexCursor cursor1 = idx.forwardCursor(); cursor1.beforeFirst(); - assertHasNext( cursor1, StoreUtils.getUUIDString( 1 ) ); - assertHasNext( cursor1, StoreUtils.getUUIDString( 2 ) ); + assertHasNext( cursor1, Strings.getUUIDString( 1 ) ); + assertHasNext( cursor1, Strings.getUUIDString( 2 ) ); - idx.drop( "c", StoreUtils.getUUIDString( 3 ) ); + idx.drop( "c", Strings.getUUIDString( 3 ) ); int id; if ( idx instanceof JdbmIndex ) @@ -147,7 +146,7 @@ public class IndexTest for ( ; id < 27; id++ ) { - assertHasNext( cursor1, StoreUtils.getUUIDString( id ) ); + assertHasNext( cursor1, Strings.getUUIDString( id ) ); } assertFalse(cursor1.next()); Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java?rev=1200292&r1=1200291&r2=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java (original) +++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java Thu Nov 10 12:29:58 2011 @@ -134,7 +134,7 @@ public class PartitionTest partition.initialize(); - StoreUtils.loadExampleData( partition, schemaManager ); + XdbmStoreUtils.loadExampleData( partition, schemaManager ); LOG.debug( "Created new partition" ); } @@ -383,7 +383,7 @@ public class PartitionTest entry.add( "sn", "user sn" ); // add - StoreUtils.injectEntryInStore( partition, entry, 12 ); + XdbmStoreUtils.injectEntryInStore( partition, entry, 12 ); verifyParentId( dn ); // move Copied: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/XdbmStoreUtils.java (from r1200224, directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/XdbmStoreUtils.java?p2=directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/XdbmStoreUtils.java&p1=directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java&r1=1200224&r2=1200292&rev=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java (original) +++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/XdbmStoreUtils.java Thu Nov 10 12:29:58 2011 @@ -30,6 +30,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; +import org.apache.directory.shared.util.Strings; /** @@ -37,7 +38,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class StoreUtils +public class XdbmStoreUtils { /** CSN factory instance */ private static final CsnFactory CSN_FACTORY = new CsnFactory( 0 ); @@ -184,21 +185,9 @@ public class StoreUtils public static void injectEntryInStore( Store store, Entry entry, int idx ) throws Exception { entry.add( SchemaConstants.ENTRY_CSN_AT, CSN_FACTORY.newInstance().toString() ); - entry.add( SchemaConstants.ENTRY_UUID_AT, getUUIDString( idx ).toString() ); + entry.add( SchemaConstants.ENTRY_UUID_AT, Strings.getUUIDString( idx ).toString() ); AddOperationContext addContext = new AddOperationContext( null, entry ); ((Partition)store).add( addContext ); } - - public static UUID getUUIDString( int idx ) - { - /** UUID string */ - UUID baseUUID = UUID.fromString( "00000000-0000-0000-0000-000000000000" ); - - long low = baseUUID.getLeastSignificantBits(); - long high = baseUUID.getMostSignificantBits(); - low = low + idx; - - return new UUID( high, low ); - } } Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java?rev=1200292&r1=1200291&r2=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java (original) +++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java Thu Nov 10 12:29:58 2011 @@ -40,7 +40,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.partition.index.Index; import org.apache.directory.server.core.api.partition.index.IndexEntry; import org.apache.directory.server.core.api.partition.index.IndexNotFoundException; -import org.apache.directory.server.xdbm.StoreUtils; +import org.apache.directory.server.xdbm.XdbmStoreUtils; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.cursor.Cursor; @@ -61,6 +61,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; @@ -145,7 +146,7 @@ public class AvlPartitionTest partition.initialize(); - StoreUtils.loadExampleData( partition, schemaManager ); + XdbmStoreUtils.loadExampleData( partition, schemaManager ); LOG.debug( "Created new partition" ); } @@ -419,13 +420,13 @@ public class AvlPartitionTest assertNotNull( cursor ); cursor.beforeFirst(); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() ); assertTrue( cursor.next() ); - assertEquals( 3, partition.getChildCount( StoreUtils.getUUIDString( 1 ) ) ); + assertEquals( 3, partition.getChildCount( Strings.getUUIDString( 1 ) ) ); - partition.delete( StoreUtils.getUUIDString( 2 ) ); + partition.delete( Strings.getUUIDString( 2 ) ); - assertEquals( 2, partition.getChildCount( StoreUtils.getUUIDString( 1 ) ) ); + assertEquals( 2, partition.getChildCount( Strings.getUUIDString( 1 ) ) ); assertEquals( 10, partition.count() ); // add an alias and delete to test dropAliasIndices method @@ -436,12 +437,12 @@ public class AvlPartitionTest entry.add( "commonName", "Jack Daniels" ); 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.add( addContext ); - partition.delete( StoreUtils.getUUIDString( 12 ) ); + partition.delete( Strings.getUUIDString( 12 ) ); } @@ -452,28 +453,28 @@ public class AvlPartitionTest assertEquals( 19, idx.count() ); - Cursor> cursor = idx.forwardCursor( StoreUtils.getUUIDString( 2 ) ); + Cursor> cursor = idx.forwardCursor( Strings.getUUIDString( 2 ) ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() ); assertFalse( cursor.next() ); - idx.drop( StoreUtils.getUUIDString( 5 ) ); + idx.drop( Strings.getUUIDString( 5 ) ); - cursor = idx.forwardCursor( StoreUtils.getUUIDString( 2 ) ); + cursor = idx.forwardCursor( Strings.getUUIDString( 2 ) ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 2 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 2 ), cursor.get().getId() ); assertTrue( cursor.next() ); - assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() ); assertFalse( cursor.next() ); @@ -484,25 +485,25 @@ public class AvlPartitionTest entry.add( "ou", "Sales" ); entry.add( "cn", "Martin King" ); 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.add( addContext ); - cursor = idx.forwardCursor( StoreUtils.getUUIDString( 2 ) ); + cursor = idx.forwardCursor( Strings.getUUIDString( 2 ) ); cursor.afterLast(); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 12 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 12 ), cursor.get().getId() ); Dn newParentDn = new Dn( schemaManager, "ou=Board of Directors,o=Good Times Co." ); Dn newDn = newParentDn.add( martinDn.getRdn() ); partition.move( martinDn, newParentDn, newDn, new ClonedServerEntry( entry ) ); - cursor = idx.forwardCursor( StoreUtils.getUUIDString( 3 ) ); + cursor = idx.forwardCursor( Strings.getUUIDString( 3 ) ); cursor.afterLast(); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 12 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 12 ), cursor.get().getId() ); // dn id 13 Dn marketingDn = new Dn( schemaManager, "ou=Marketing,ou=Sales,o=Good Times Co." ); @@ -510,7 +511,7 @@ public class AvlPartitionTest entry.add( "objectClass", "top", "organizationalUnit" ); entry.add( "ou", "Marketing" ); 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.add( addContext ); @@ -522,7 +523,7 @@ public class AvlPartitionTest entry.add( "ou", "Marketing" ); entry.add( "cn", "Jimmy Wales" ); entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() ); - entry.add( "entryUUID", StoreUtils.getUUIDString( 14 ).toString() ); + entry.add( "entryUUID", Strings.getUUIDString( 14 ).toString() ); addContext = new AddOperationContext( null, entry ); partition.add( addContext ); @@ -530,29 +531,29 @@ public class AvlPartitionTest newDn = newParentDn.add( marketingDn.getRdn() ); partition.move( marketingDn, newParentDn, newDn, new ClonedServerEntry( entry ) ); - cursor = idx.forwardCursor( StoreUtils.getUUIDString( 3 ) ); + cursor = idx.forwardCursor( Strings.getUUIDString( 3 ) ); cursor.afterLast(); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 14 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 14 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 13 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 13 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 12 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 12 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 3 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 3 ), cursor.get().getId() ); assertFalse( cursor.previous() ); } @@ -580,7 +581,7 @@ public class AvlPartitionTest entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "ou", "Not Present" ); entry.add( "cn", "Martin King" ); - entry.add( "entryUUID", StoreUtils.getUUIDString( 15 ).toString() ); + entry.add( "entryUUID", Strings.getUUIDString( 15 ).toString() ); AddOperationContext addContext = new AddOperationContext( null, entry ); partition.add( addContext ); @@ -594,7 +595,7 @@ public class AvlPartitionTest DefaultEntry entry = new DefaultEntry( schemaManager, dn ); entry.add( "ou", "Sales" ); entry.add( "cn", "Martin King" ); - entry.add( "entryUUID", StoreUtils.getUUIDString( 16 ).toString() ); + entry.add( "entryUUID", Strings.getUUIDString( 16 ).toString() ); AddOperationContext addContext = new AddOperationContext( null, entry ); partition.add( addContext ); @@ -624,7 +625,7 @@ public class AvlPartitionTest entry.add( "ou", "Engineering" ); entry.add( "cn", "Private Ryan" ); entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() ); - entry.add( "entryUUID", StoreUtils.getUUIDString( 17 ).toString() ); + entry.add( "entryUUID", Strings.getUUIDString( 17 ).toString() ); AddOperationContext addContext = new AddOperationContext( null, entry ); partition.add( addContext ); @@ -644,7 +645,7 @@ public class AvlPartitionTest entry.add( "ou", "Engineering" ); entry.add( "cn", "Private Ryan" ); entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() ); - entry.add( "entryUUID", StoreUtils.getUUIDString( 18 ).toString() ); + entry.add( "entryUUID", Strings.getUUIDString( 18 ).toString() ); AddOperationContext addContext = new AddOperationContext( null, entry ); partition.add( addContext ); @@ -670,7 +671,7 @@ public class AvlPartitionTest childEntry.add( "ou", "Engineering" ); childEntry.add( "cn", "Private Ryan" ); childEntry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() ); - childEntry.add( "entryUUID", StoreUtils.getUUIDString( 19 ).toString() ); + childEntry.add( "entryUUID", Strings.getUUIDString( 19 ).toString() ); AddOperationContext addContext = new AddOperationContext( null, childEntry ); partition.add( addContext ); @@ -779,7 +780,7 @@ public class AvlPartitionTest entry.add( "objectClass", "top", "person", "organizationalPerson" ); entry.add( "cn", "Tim B" ); entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() ); - entry.add( "entryUUID", StoreUtils.getUUIDString( 20 ).toString() ); + entry.add( "entryUUID", Strings.getUUIDString( 20 ).toString() ); AddOperationContext addContext = new AddOperationContext( null, entry ); partition.add( addContext ); Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1200292&r1=1200291&r2=1200292&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java (original) +++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java Thu Nov 10 12:29:58 2011 @@ -32,7 +32,7 @@ import org.apache.directory.server.const import org.apache.directory.server.core.api.partition.index.Index; import org.apache.directory.server.core.api.partition.index.IndexEntry; import org.apache.directory.server.core.api.partition.index.ParentIdAndRdn; -import org.apache.directory.server.xdbm.StoreUtils; +import org.apache.directory.server.xdbm.XdbmStoreUtils; import org.apache.directory.shared.ldap.model.cursor.Cursor; import org.apache.directory.shared.ldap.model.name.Rdn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -40,6 +40,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; @@ -187,23 +188,23 @@ public class AvlRdnIndexTest initIndex(); assertEquals( 0, idx.count() ); - ParentIdAndRdn key = new ParentIdAndRdn( StoreUtils.getUUIDString( 0 ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUIDString( 0 ), new Rdn( "cn=key" ) ); - idx.add( key, StoreUtils.getUUIDString( 0 ) ); + idx.add( key, Strings.getUUIDString( 0 ) ); assertEquals( 1, idx.count() ); // setting a different parentId should make this key a different key - key = new ParentIdAndRdn( StoreUtils.getUUIDString( 1 ), new Rdn( "cn=key" ) ); + key = new ParentIdAndRdn( Strings.getUUIDString( 1 ), new Rdn( "cn=key" ) ); - idx.add( key, StoreUtils.getUUIDString( 1 ) ); + idx.add( key, Strings.getUUIDString( 1 ) ); assertEquals( 2, idx.count() ); //count shouldn't get affected cause of inserting the same key - idx.add( key, StoreUtils.getUUIDString( 2 ) ); + idx.add( key, Strings.getUUIDString( 2 ) ); assertEquals( 2, idx.count() ); - key = new ParentIdAndRdn( StoreUtils.getUUIDString( 2 ), new Rdn( "cn=key" ) ); - idx.add( key, StoreUtils.getUUIDString( 3 ) ); + key = new ParentIdAndRdn( Strings.getUUIDString( 2 ), new Rdn( "cn=key" ) ); + idx.add( key, Strings.getUUIDString( 3 ) ); assertEquals( 3, idx.count() ); } @@ -213,11 +214,11 @@ public class AvlRdnIndexTest { initIndex(); - ParentIdAndRdn key = new ParentIdAndRdn( StoreUtils.getUUIDString( 0 ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUIDString( 0 ), new Rdn( "cn=key" ) ); assertEquals( 0, idx.count( key ) ); - idx.add( key, StoreUtils.getUUIDString( 0 ) ); + idx.add( key, Strings.getUUIDString( 0 ) ); assertEquals( 1, idx.count( key ) ); } @@ -231,13 +232,13 @@ public class AvlRdnIndexTest { initIndex(); - ParentIdAndRdn key = new ParentIdAndRdn( StoreUtils.getUUIDString( 0 ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUIDString( 0 ), new Rdn( "cn=key" ) ); assertNull( idx.forwardLookup( key ) ); - idx.add( key, StoreUtils.getUUIDString( 1 ) ); - assertEquals( StoreUtils.getUUIDString( 1 ), idx.forwardLookup( key ) ); - assertEquals( key, idx.reverseLookup( StoreUtils.getUUIDString( 1 ) ) ); + idx.add( key, Strings.getUUIDString( 1 ) ); + assertEquals( Strings.getUUIDString( 1 ), idx.forwardLookup( key ) ); + assertEquals( key, idx.reverseLookup( Strings.getUUIDString( 1 ) ) ); } @@ -246,17 +247,17 @@ public class AvlRdnIndexTest { initIndex(); - ParentIdAndRdn key = new ParentIdAndRdn( StoreUtils.getUUIDString( 0 ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUIDString( 0 ), new Rdn( "cn=key" ) ); assertNull( idx.forwardLookup( key ) ); // test add/drop without adding any duplicates - idx.add( key, StoreUtils.getUUIDString( 1 ) ); - assertEquals( StoreUtils.getUUIDString( 1 ), idx.forwardLookup( key ) ); + idx.add( key, Strings.getUUIDString( 1 ) ); + assertEquals( Strings.getUUIDString( 1 ), idx.forwardLookup( key ) ); - idx.drop( key, StoreUtils.getUUIDString( 1 ) ); + idx.drop( key, Strings.getUUIDString( 1 ) ); assertNull( idx.forwardLookup( key ) ); - assertNull( idx.reverseLookup( StoreUtils.getUUIDString( 1 ) ) ); + assertNull( idx.reverseLookup( Strings.getUUIDString( 1 ) ) ); } @@ -269,18 +270,18 @@ public class AvlRdnIndexTest { initIndex(); - ParentIdAndRdn key = new ParentIdAndRdn( StoreUtils.getUUIDString( 0 ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUIDString( 0 ), new Rdn( "cn=key" ) ); assertEquals( 0, idx.count() ); - idx.add( key, StoreUtils.getUUIDString( 0 ) ); + idx.add( key, Strings.getUUIDString( 0 ) ); assertEquals( 1, idx.count() ); for ( long i = 1; i < 5; i++ ) { - key = new ParentIdAndRdn( StoreUtils.getUUIDString( ( int )i ), new Rdn( "cn=key" + i ) ); + key = new ParentIdAndRdn( Strings.getUUIDString( ( int )i ), new Rdn( "cn=key" + i ) ); - idx.add( key, StoreUtils.getUUIDString( ( int ) i ) ); + idx.add( key, Strings.getUUIDString( ( int ) i ) ); } assertEquals( 5, idx.count() ); @@ -291,21 +292,21 @@ public class AvlRdnIndexTest cursor.next(); IndexEntry e1 = cursor.get(); - assertEquals( StoreUtils.getUUIDString( 0 ), e1.getId() ); + assertEquals( Strings.getUUIDString( 0 ), e1.getId() ); assertEquals( "cn=key", e1.getValue().getRdns()[0].getName() ); - assertEquals( StoreUtils.getUUIDString( 0 ), e1.getValue().getParentId() ); + assertEquals( Strings.getUUIDString( 0 ), e1.getValue().getParentId() ); cursor.next(); IndexEntry e2 = cursor.get(); - assertEquals( StoreUtils.getUUIDString( 1 ), e2.getId() ); + assertEquals( Strings.getUUIDString( 1 ), e2.getId() ); assertEquals( "cn=key1", e2.getValue().getRdns()[0].getName() ); - assertEquals( StoreUtils.getUUIDString( 1 ), e2.getValue().getParentId() ); + assertEquals( Strings.getUUIDString( 1 ), e2.getValue().getParentId() ); cursor.next(); IndexEntry e3 = cursor.get(); - assertEquals( StoreUtils.getUUIDString( 2 ), e3.getId() ); + assertEquals( Strings.getUUIDString( 2 ), e3.getId() ); assertEquals( "cn=key2", e3.getValue().getRdns()[0].getName() ); - assertEquals( StoreUtils.getUUIDString( 2 ), e3.getValue().getParentId() ); + assertEquals( Strings.getUUIDString( 2 ), e3.getValue().getParentId() ); } // @Test Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.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/AndCursorTest.java (original) +++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Thu Nov 10 12:29:58 2011 @@ -35,7 +35,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; @@ -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; @@ -141,7 +142,7 @@ public class AndCursorTest ((Partition)store).initialize(); - StoreUtils.loadExampleData( store, schemaManager ); + XdbmStoreUtils.loadExampleData( store, schemaManager ); evaluatorBuilder = new EvaluatorBuilder( store, schemaManager ); cursorBuilder = new CursorBuilder( store, evaluatorBuilder ); @@ -181,17 +182,17 @@ public class AndCursorTest 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( 5 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() ); assertEquals( "johnny walker", cursor.get().getValue() ); assertFalse( cursor.next() ); @@ -232,19 +233,19 @@ public class AndCursorTest 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() ); cursor.first(); 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( 5 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() ); assertEquals( "johnny walker", cursor.get().getValue() ); assertFalse( cursor.next() ); @@ -254,19 +255,19 @@ public class AndCursorTest assertTrue( cursor.previous() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() ); assertEquals( "johnny walker", cursor.get().getValue() ); cursor.last(); 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/GreaterEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.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/GreaterEqTest.java (original) +++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.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; @@ -140,7 +141,7 @@ public class GreaterEqTest ((Partition)store).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." ) ); ((Partition)store).initialize(); - StoreUtils.loadExampleData( store, schemaManager ); + XdbmStoreUtils.loadExampleData( store, schemaManager ); LOG.debug( "Created new store" ); } @@ -192,22 +193,22 @@ public class GreaterEqTest 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() ); assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() ); assertEquals( "4", cursor.get().getValue() ); assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() ); assertEquals( "5", cursor.get().getValue() ); assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() ); assertEquals( "6", cursor.get().getValue() ); assertFalse( cursor.next() ); @@ -222,22 +223,22 @@ public class GreaterEqTest cursor.first(); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() ); assertEquals( "3", cursor.get().getValue() ); assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() ); assertEquals( "4", cursor.get().getValue() ); assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() ); assertEquals( "5", cursor.get().getValue() ); assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() ); assertEquals( "6", cursor.get().getValue() ); assertFalse( cursor.next() ); @@ -254,22 +255,22 @@ public class GreaterEqTest assertTrue( cursor.previous() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() ); assertEquals( "6", cursor.get().getValue() ); assertTrue( cursor.previous() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() ); assertEquals( "5", cursor.get().getValue() ); assertTrue( cursor.previous() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() ); assertEquals( "4", cursor.get().getValue() ); 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() ); assertFalse( cursor.previous() ); @@ -284,22 +285,22 @@ public class GreaterEqTest cursor.last(); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() ); assertEquals( "6", cursor.get().getValue() ); assertTrue( cursor.previous() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() ); assertEquals( "5", cursor.get().getValue() ); assertTrue( cursor.previous() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() ); assertEquals( "4", cursor.get().getValue() ); 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() ); assertFalse( cursor.previous() ); @@ -319,12 +320,12 @@ public class GreaterEqTest assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() ); assertEquals( "5", cursor.get().getValue() ); assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() ); assertEquals( "6", cursor.get().getValue() ); assertFalse( cursor.next() ); @@ -338,7 +339,7 @@ public class GreaterEqTest cursor.before( indexEntry ); assertFalse( cursor.available() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() ); assertEquals( "6", cursor.get().getValue() ); cursor.close(); @@ -348,7 +349,7 @@ public class GreaterEqTest 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(); @@ -364,12 +365,12 @@ public class GreaterEqTest assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 7 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 7 ), cursor.get().getId() ); assertEquals( "5", cursor.get().getValue() ); assertTrue( cursor.next() ); assertTrue( cursor.available() ); - assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() ); assertEquals( "6", cursor.get().getValue() ); assertFalse( cursor.next() ); @@ -383,7 +384,7 @@ public class GreaterEqTest cursor.after( indexEntry ); assertFalse( cursor.available() ); assertTrue( cursor.previous() ); - assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() ); + assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() ); assertEquals( "6", cursor.get().getValue() ); cursor.close(); @@ -393,7 +394,7 @@ public class GreaterEqTest 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(); } @@ -433,10 +434,10 @@ public class GreaterEqTest set.add( new Tuple( cursor.get().getValue(), cursor.get().getId() ) ); } assertEquals( 4, set.size() ); - assertTrue( set.contains( new Tuple( "3", StoreUtils.getUUIDString( 5 ) ) ) ); - assertTrue( set.contains( new Tuple( "4", StoreUtils.getUUIDString( 6 ) ) ) ); - assertTrue( set.contains( new Tuple( "5", StoreUtils.getUUIDString( 7 ) ) ) ); - assertTrue( set.contains( new Tuple( "6", StoreUtils.getUUIDString( 8 ) ) ) ); + assertTrue( set.contains( new Tuple( "3", Strings.getUUIDString( 5 ) ) ) ); + assertTrue( set.contains( new Tuple( "4", Strings.getUUIDString( 6 ) ) ) ); + assertTrue( set.contains( new Tuple( "5", Strings.getUUIDString( 7 ) ) ) ); + assertTrue( set.contains( new Tuple( "6", Strings.getUUIDString( 8 ) ) ) ); assertFalse( cursor.next() ); assertFalse( cursor.available() ); @@ -459,10 +460,10 @@ public class GreaterEqTest set.add( new Tuple( cursor.get().getValue(), cursor.get().getId() ) ); } assertEquals( 4, set.size() ); - assertTrue( set.contains( new Tuple( "3", StoreUtils.getUUIDString( 5 ) ) ) ); - assertTrue( set.contains( new Tuple( "4", StoreUtils.getUUIDString( 6 ) ) ) ); - assertTrue( set.contains( new Tuple( "5", StoreUtils.getUUIDString( 7 ) ) ) ); - assertTrue( set.contains( new Tuple( "6", StoreUtils.getUUIDString( 8 ) ) ) ); + assertTrue( set.contains( new Tuple( "3", Strings.getUUIDString( 5 ) ) ) ); + assertTrue( set.contains( new Tuple( "4", Strings.getUUIDString( 6 ) ) ) ); + assertTrue( set.contains( new Tuple( "5", Strings.getUUIDString( 7 ) ) ) ); + assertTrue( set.contains( new Tuple( "6", Strings.getUUIDString( 8 ) ) ) ); assertFalse( cursor.next() ); assertFalse( cursor.available() ); @@ -483,10 +484,10 @@ public class GreaterEqTest set.add( new Tuple( cursor.get().getValue(), cursor.get().getId() ) ); } assertEquals( 4, set.size() ); - assertTrue( set.contains( new Tuple( "3", StoreUtils.getUUIDString( 5 ) ) ) ); - assertTrue( set.contains( new Tuple( "4", StoreUtils.getUUIDString( 6 ) ) ) ); - assertTrue( set.contains( new Tuple( "5", StoreUtils.getUUIDString( 7 ) ) ) ); - assertTrue( set.contains( new Tuple( "6", StoreUtils.getUUIDString( 8 ) ) ) ); + assertTrue( set.contains( new Tuple( "3", Strings.getUUIDString( 5 ) ) ) ); + assertTrue( set.contains( new Tuple( "4", Strings.getUUIDString( 6 ) ) ) ); + assertTrue( set.contains( new Tuple( "5", Strings.getUUIDString( 7 ) ) ) ); + assertTrue( set.contains( new Tuple( "6", Strings.getUUIDString( 8 ) ) ) ); assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -506,10 +507,10 @@ public class GreaterEqTest set.add( new Tuple( cursor.get().getValue(), cursor.get().getId() ) ); } assertEquals( 4, set.size() ); - assertTrue( set.contains( new Tuple( "3", StoreUtils.getUUIDString( 5 ) ) ) ); - assertTrue( set.contains( new Tuple( "4", StoreUtils.getUUIDString( 6 ) ) ) ); - assertTrue( set.contains( new Tuple( "5", StoreUtils.getUUIDString( 7 ) ) ) ); - assertTrue( set.contains( new Tuple( "6", StoreUtils.getUUIDString( 8 ) ) ) ); + assertTrue( set.contains( new Tuple( "3", Strings.getUUIDString( 5 ) ) ) ); + assertTrue( set.contains( new Tuple( "4", Strings.getUUIDString( 6 ) ) ) ); + assertTrue( set.contains( new Tuple( "5", Strings.getUUIDString( 7 ) ) ) ); + assertTrue( set.contains( new Tuple( "6", Strings.getUUIDString( 8 ) ) ) ); assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -560,35 +561,35 @@ public class GreaterEqTest assertNotNull( evaluator.getNormalizer() ); assertNotNull( evaluator.getComparator() ); - indexEntry.setId( StoreUtils.getUUIDString( 1 ) ); + indexEntry.setId( Strings.getUUIDString( 1 ) ); assertFalse( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 4 ) ); + indexEntry.setId( Strings.getUUIDString( 4 ) ); assertFalse( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 5 ) ); + indexEntry.setId( Strings.getUUIDString( 5 ) ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 6 ) ); + indexEntry.setId( Strings.getUUIDString( 6 ) ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 7 ) ); + indexEntry.setId( Strings.getUUIDString( 7 ) ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 8 ) ); + indexEntry.setId( Strings.getUUIDString( 8 ) ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 9 ) ); + indexEntry.setId( Strings.getUUIDString( 9 ) ); assertFalse( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 10 ) ); + indexEntry.setId( Strings.getUUIDString( 10 ) ); assertFalse( evaluator.evaluate( indexEntry ) ); } @@ -612,12 +613,12 @@ public class GreaterEqTest 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 ) ); } @@ -635,7 +636,7 @@ public class GreaterEqTest assertNotNull( evaluator.getNormalizer() ); assertNotNull( evaluator.getComparator() ); - indexEntry.setId( StoreUtils.getUUIDString( 1 ) ); + indexEntry.setId( Strings.getUUIDString( 1 ) ); assertFalse( evaluator.evaluate( indexEntry ) ); } @@ -653,35 +654,35 @@ public class GreaterEqTest assertNotNull( evaluator.getNormalizer() ); assertNotNull( evaluator.getComparator() ); - indexEntry.setId( StoreUtils.getUUIDString( 1 ) ); + indexEntry.setId( Strings.getUUIDString( 1 ) ); assertFalse( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 4 ) ); + indexEntry.setId( Strings.getUUIDString( 4 ) ); assertFalse( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 5 ) ); + indexEntry.setId( Strings.getUUIDString( 5 ) ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 6 ) ); + indexEntry.setId( Strings.getUUIDString( 6 ) ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 7 ) ); + indexEntry.setId( Strings.getUUIDString( 7 ) ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 8 ) ); + indexEntry.setId( Strings.getUUIDString( 8 ) ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 9 ) ); + indexEntry.setId( Strings.getUUIDString( 9 ) ); assertFalse( evaluator.evaluate( indexEntry ) ); indexEntry = new ForwardIndexEntry(); - indexEntry.setId( StoreUtils.getUUIDString( 10 ) ); + indexEntry.setId( Strings.getUUIDString( 10 ) ); assertFalse( evaluator.evaluate( indexEntry ) ); }