directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r762540 - in /directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl: NestedFilterTest.java NotCursorTest.java OneLevelScopeTest.java
Date Mon, 06 Apr 2009 22:28:15 GMT
Author: akarasulu
Date: Mon Apr  6 22:28:15 2009
New Revision: 762540

URL: http://svn.apache.org/viewvc?rev=762540&view=rev
Log:
fixing breakage in tests against store interface

Modified:
    directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
    directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
    directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java

Modified: directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=762540&r1=762539&r2=762540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
(original)
+++ directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
Mon Apr  6 22:28:15 2009
@@ -41,7 +41,6 @@
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
@@ -66,7 +65,7 @@
     private static final Logger LOG = LoggerFactory.getLogger( NestedFilterTest.class.getSimpleName()
);
 
     File wkdir;
-    Store<ServerEntry> store;
+    JdbmStore<ServerEntry> store;
     Registries registries = null;
     AttributeTypeRegistry attributeRegistry;
     EvaluatorBuilder evaluatorBuilder;
@@ -94,6 +93,7 @@
     }
 
     
+    @SuppressWarnings("unchecked")
     @Before
     public void createStore() throws Exception
     {
@@ -222,6 +222,6 @@
         ExprNode exprNode = FilterParser.parse( filter );
         optimizer.annotate( exprNode );
         
-        IndexCursor<?,ServerEntry> cursor = cursorBuilder.build( exprNode );
+        cursorBuilder.build( exprNode );
     }
 }

Modified: directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=762540&r1=762539&r2=762540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
(original)
+++ directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
Mon Apr  6 22:28:15 2009
@@ -45,7 +45,6 @@
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
-import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
@@ -71,7 +70,7 @@
     private static final Logger LOG = LoggerFactory.getLogger( NotCursorTest.class.getSimpleName()
);
 
     File wkdir;
-    Store<ServerEntry> store;
+    JdbmStore<ServerEntry> store;
     Registries registries = null;
     AttributeTypeRegistry attributeRegistry;
     EvaluatorBuilder evaluatorBuilder;
@@ -115,8 +114,8 @@
         store.setWorkingDirectory( wkdir );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new JdbmIndex<String,ServerEntry>( SchemaConstants.OU_AT_OID
) );
+        store.addIndex( new JdbmIndex<String,ServerEntry>( SchemaConstants.CN_AT_OID
) );
         StoreUtils.loadExampleData( store, registries );
         
         evaluatorBuilder = new EvaluatorBuilder( store, registries );
@@ -190,6 +189,7 @@
     }
     
     
+    @SuppressWarnings("unchecked")
     @Test
     public void testNotCursorWithManualFilter() throws Exception
     {

Modified: directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=762540&r1=762539&r2=762540&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
(original)
+++ directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
Mon Apr  6 22:28:15 2009
@@ -22,7 +22,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
@@ -65,7 +64,7 @@
 
 
     File wkdir;
-    Store<ServerEntry> store;
+    JdbmStore<ServerEntry> store;
     Registries registries = null;
     AttributeTypeRegistry attributeRegistry;
 
@@ -108,8 +107,8 @@
         store.setWorkingDirectory( wkdir );
         store.setSyncOnWrite( true );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new JdbmIndex<String,ServerEntry>( SchemaConstants.OU_AT_OID
) );
+        store.addIndex( new JdbmIndex<String,ServerEntry>( SchemaConstants.CN_AT_OID
) );
         StoreUtils.loadExampleData( store, registries );
         LOG.debug( "Created new store" );
     }



Mime
View raw message