svn commit: r1302913 - in /directory/apacheds/trunk: jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ xdbm-partition/src/test/java/org/apache/directo...

[el...@apache.org]

Author: elecharny
Date: Tue Mar 20 14:26:44 2012
New Revision: 1302913

URL: http://svn.apache.org/viewvc?rev=1302913&view=rev
Log:
Removed the useless GenericIndex class

Removed:
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java
Modified:
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1302913&r1=1302912&r2=1302913&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Tue Mar 20 14:26:44 2012
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import java.io.File;
-import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.UUID;
 
@@ -36,7 +35,6 @@ import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
-import org.apache.directory.server.xdbm.GenericIndex;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.IndexNotFoundException;
@@ -654,27 +652,6 @@ public class JdbmStoreTest
     }
 
 
-    @Test
-    public void testConvertIndex() throws Exception
-    {
-        // just create the new directory under working directory
-        // so this gets cleaned up automatically
-        File testSpecificDir = new File( wkdir, "testConvertIndex" );
-        testSpecificDir.mkdirs();
-
-        Index<?, Object, Long> nonJdbmIndex = new GenericIndex<Object, Object, Long>( "ou", 10, testSpecificDir.toURI() );
-
-        Method convertIndex = store.getClass().getDeclaredMethod( "convertAndInit", Index.class );
-        convertIndex.setAccessible( true );
-        Object obj = convertIndex.invoke( store, nonJdbmIndex );
-
-        assertNotNull( obj );
-        assertEquals( JdbmIndex.class, obj.getClass() );
-
-        ( ( JdbmIndex ) obj ).close();
-    }
-
-
     @Test(expected = LdapNoSuchObjectException.class)
     public void testAddWithoutParentId() throws Exception
     {

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java?rev=1302913&r1=1302912&r2=1302913&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java Tue Mar 20 14:26:44 2012
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import java.io.File;
-import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.UUID;
 
@@ -36,7 +35,6 @@ import org.apache.directory.server.const
 import org.apache.directory.server.core.api.entry.ClonedServerEntry;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
-import org.apache.directory.server.xdbm.GenericIndex;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.IndexNotFoundException;
@@ -559,20 +557,6 @@ public class AvlPartitionTest
     }
 
 
-    @Test
-    public void testConvertIndex() throws Exception
-    {
-        Index nonAvlIndex = new GenericIndex( "ou", 10, new File( "." ).toURI() );
-
-        Method convertIndex = partition.getClass().getDeclaredMethod( "convertAndInit", Index.class );
-        convertIndex.setAccessible( true );
-        Object obj = convertIndex.invoke( partition, nonAvlIndex );
-
-        assertNotNull( obj );
-        assertEquals( AvlIndex.class, obj.getClass() );
-    }
-
-
     @Test(expected = LdapNoSuchObjectException.class)
     public void testAddWithoutParentId() throws Exception
     {