directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1588658 - /directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/
Date Sat, 19 Apr 2014 15:11:09 GMT
Author: elecharny
Date: Sat Apr 19 15:11:09 2014
New Revision: 1588658

URL: http://svn.apache.org/r1588658
Log:
Removed some warnings

Modified:
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1588658&r1=1588657&r2=1588658&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
Sat Apr 19 15:11:09 2014
@@ -127,8 +127,8 @@ public class AndCursorTest extends Abstr
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
         ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." )
);
         ( ( Partition ) store ).initialize();
 

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java?rev=1588658&r1=1588657&r2=1588658&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java
Sat Apr 19 15:11:09 2014
@@ -135,8 +135,8 @@ public class EqualityTest
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
         ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." )
);
         ( ( Partition ) store ).initialize();
 

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1588658&r1=1588657&r2=1588658&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
Sat Apr 19 15:11:09 2014
@@ -145,9 +145,9 @@ public class GreaterEqTest
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.POSTALCODE_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.POSTALCODE_AT_OID ) );
         ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." )
);
         ( ( Partition ) store ).initialize();
 
@@ -178,8 +178,8 @@ public class GreaterEqTest
     public void testCursorIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID
);
-        GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
-        GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
+        GreaterEqNode<String> node = new GreaterEqNode<String>( at, new StringValue(
at, "3" ) );
+        GreaterEqEvaluator<String> evaluator = new GreaterEqEvaluator<String>(
node, store, schemaManager );
         GreaterEqCursor<String> cursor = new GreaterEqCursor<String>( store,
evaluator );
         assertNotNull( cursor );
         assertFalse( cursor.available() );
@@ -228,7 +228,7 @@ public class GreaterEqTest
 
         // ---------- test first() ----------
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
 
         cursor.first();
 
@@ -258,7 +258,7 @@ public class GreaterEqTest
 
         // ---------- test afterLast() ----------
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
 
         cursor.afterLast();
         assertFalse( cursor.available() );
@@ -290,7 +290,7 @@ public class GreaterEqTest
 
         // ---------- test last() ----------
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
 
         cursor.last();
 
@@ -320,7 +320,7 @@ public class GreaterEqTest
 
         // ---------- test before() ----------
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "5" );
 
@@ -343,7 +343,7 @@ public class GreaterEqTest
         cursor.close();
         assertTrue( cursor.isClosed() );
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "7" );
         cursor.before( indexEntry );
@@ -353,7 +353,7 @@ public class GreaterEqTest
         assertEquals( "6", cursor.get().getKey() );
         cursor.close();
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "3" );
         cursor.before( indexEntry );
@@ -365,7 +365,7 @@ public class GreaterEqTest
 
         // ---------- test after() ----------
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "4" );
 
@@ -388,7 +388,7 @@ public class GreaterEqTest
         cursor.close();
         assertTrue( cursor.isClosed() );
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "7" );
         cursor.after( indexEntry );
@@ -398,7 +398,7 @@ public class GreaterEqTest
         assertEquals( "6", cursor.get().getKey() );
         cursor.close();
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "3" );
         cursor.after( indexEntry );
@@ -414,8 +414,8 @@ public class GreaterEqTest
     public void testCursorNotIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID
);
-        GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
-        GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
+        GreaterEqNode<String> node = new GreaterEqNode<String>( at, new StringValue(
at, "3" ) );
+        GreaterEqEvaluator<String> evaluator = new GreaterEqEvaluator<String>(
node, store, schemaManager );
         GreaterEqCursor<String> cursor = new GreaterEqCursor<String>( store,
evaluator );
         assertNotNull( cursor );
         assertFalse( cursor.available() );
@@ -458,7 +458,7 @@ public class GreaterEqTest
         // ---------- test first() ----------
 
         set.clear();
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         cursor.first();
 
         assertTrue( cursor.available() );
@@ -469,6 +469,7 @@ public class GreaterEqTest
             assertTrue( cursor.available() );
             set.add( new Tuple<String, String>( cursor.get().getKey(), cursor.get().getId()
) );
         }
+        
         assertEquals( 4, set.size() );
         assertTrue( set.contains( new Tuple<String, String>( "3", Strings.getUUID(
5L ) ) ) );
         assertTrue( set.contains( new Tuple<String, String>( "4", Strings.getUUID(
6L ) ) ) );
@@ -484,7 +485,7 @@ public class GreaterEqTest
         // ---------- test afterLast() ----------
 
         set.clear();
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         cursor.afterLast();
         assertFalse( cursor.available() );
 
@@ -507,7 +508,7 @@ public class GreaterEqTest
         // ---------- test last() ----------
 
         set.clear();
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         cursor.last();
 
         assertTrue( cursor.available() );
@@ -531,7 +532,7 @@ public class GreaterEqTest
 
         // ---------- test before() ----------
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "2" );
 
@@ -548,7 +549,7 @@ public class GreaterEqTest
 
         // ---------- test after() ----------
 
-        cursor = new GreaterEqCursor( store, evaluator );
+        cursor = new GreaterEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "2" );
         try
@@ -572,8 +573,8 @@ public class GreaterEqTest
     public void testEvaluatorIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID
);
-        GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
-        GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
+        GreaterEqNode<String> node = new GreaterEqNode<String>( at, new StringValue(
at, "3" ) );
+        GreaterEqEvaluator<String> evaluator = new GreaterEqEvaluator<String>(
node, store, schemaManager );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTALCODE_AT_OID, evaluator.getAttributeType().getOid()
);
@@ -617,8 +618,8 @@ public class GreaterEqTest
     public void testEvaluatorWithDescendantValue() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID
);
-        GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "2" ) );
-        GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
+        GreaterEqNode<String> node = new GreaterEqNode<String>( at, new StringValue(
at, "2" ) );
+        GreaterEqEvaluator<String> evaluator = new GreaterEqEvaluator<String>(
node, store, schemaManager );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.STREET_AT_OID, evaluator.getAttributeType().getOid()
);
@@ -646,9 +647,9 @@ public class GreaterEqTest
     public void testEvaluatorWithoutDescendants() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.C_POSTALCODE_AT_OID
);
-        GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "2" ) );
+        GreaterEqNode<String> node = new GreaterEqNode<String>( at, new StringValue(
at, "2" ) );
 
-        GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
+        GreaterEqEvaluator<String> evaluator = new GreaterEqEvaluator<String>(
node, store, schemaManager );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.C_POSTALCODE_AT_OID, evaluator.getAttributeType().getOid()
);
@@ -664,9 +665,9 @@ public class GreaterEqTest
     public void testEvaluatorNotIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID
);
-        GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
+        GreaterEqNode<String> node = new GreaterEqNode<String>( at, new StringValue(
at, "3" ) );
 
-        GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager
);
+        GreaterEqEvaluator<String> evaluator = new GreaterEqEvaluator<String>(
node, store, schemaManager );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTOFFICEBOX_AT_OID, evaluator.getAttributeType().getOid()
);
@@ -720,8 +721,8 @@ public class GreaterEqTest
 
         try
         {
-            GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
-            new GreaterEqEvaluator( node, store, schemaManager );
+            GreaterEqNode<String> node = new GreaterEqNode<String>( at, new StringValue(
at, "3" ) );
+            new GreaterEqEvaluator<String>( node, store, schemaManager );
         }
         finally
         {
@@ -758,8 +759,8 @@ public class GreaterEqTest
         desc.setObsolete( false );
         //schemaManager.register( at.getSyntax().getSyntaxChecker() );
 
-        GreaterEqNode node = new GreaterEqNode( at, new StringValue( at, "3" ) );
-        new GreaterEqEvaluator( node, store, schemaManager );
+        GreaterEqNode<String> node = new GreaterEqNode<String>( at, new StringValue(
at, "3" ) );
+        new GreaterEqEvaluator<String>( node, store, schemaManager );
         schemaManager.delete( at );
     }
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1588658&r1=1588657&r2=1588658&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
Sat Apr 19 15:11:09 2014
@@ -145,9 +145,9 @@ public class LessEqTest
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.POSTALCODE_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.POSTALCODE_AT_OID ) );
         ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." )
);
         ( ( Partition ) store ).initialize();
 
@@ -180,8 +180,8 @@ public class LessEqTest
     public void testCursorIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID
);
-        LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
-        LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
+        LessEqNode<String> node = new LessEqNode<String>( at, new StringValue(
at, "3" ) );
+        LessEqEvaluator<String> evaluator = new LessEqEvaluator<String>( node,
store, schemaManager );
         LessEqCursor<String> cursor = new LessEqCursor<String>( store, evaluator
);
         assertNotNull( cursor );
         assertFalse( cursor.available() );
@@ -235,7 +235,7 @@ public class LessEqTest
 
         // ---------- test first() ----------
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
 
         cursor.first();
 
@@ -270,7 +270,7 @@ public class LessEqTest
 
         // ---------- test afterLast() ----------
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
 
         cursor.afterLast();
         assertFalse( cursor.available() );
@@ -307,7 +307,7 @@ public class LessEqTest
 
         // ---------- test last() ----------
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
 
         cursor.last();
 
@@ -342,7 +342,7 @@ public class LessEqTest
 
         // ---------- test before() ----------
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "2" );
 
@@ -365,7 +365,7 @@ public class LessEqTest
         cursor.close();
         assertTrue( cursor.isClosed() );
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "7" );
         cursor.before( indexEntry );
@@ -375,7 +375,7 @@ public class LessEqTest
         assertEquals( "3", cursor.get().getKey() );
         cursor.close();
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "3" );
         cursor.before( indexEntry );
@@ -387,7 +387,7 @@ public class LessEqTest
 
         // ---------- test after() ----------
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "1" );
 
@@ -410,7 +410,7 @@ public class LessEqTest
         cursor.close();
         assertTrue( cursor.isClosed() );
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "7" );
         cursor.after( indexEntry );
@@ -420,7 +420,7 @@ public class LessEqTest
         assertEquals( "3", cursor.get().getKey() );
         cursor.close();
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "3" );
         cursor.after( indexEntry );
@@ -436,8 +436,8 @@ public class LessEqTest
     public void testCursorNotIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID
);
-        LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
-        LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
+        LessEqNode<String> node = new LessEqNode<String>( at, new StringValue(
at, "3" ) );
+        LessEqEvaluator<String> evaluator = new LessEqEvaluator<String>( node,
store, schemaManager );
         LessEqCursor<String> cursor = new LessEqCursor<String>( store, evaluator
);
         assertNotNull( cursor );
         assertFalse( cursor.available() );
@@ -480,7 +480,7 @@ public class LessEqTest
 
         // ---------- test beforeFirst() ----------
         set.clear();
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         cursor.first();
 
         assertTrue( cursor.available() );
@@ -507,7 +507,7 @@ public class LessEqTest
 
         // ---------- test afterLast() ----------
         set.clear();
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         cursor.afterLast();
         assertFalse( cursor.available() );
 
@@ -532,7 +532,7 @@ public class LessEqTest
         // ---------- test last() ----------
 
         set.clear();
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         cursor.last();
 
         assertTrue( cursor.available() );
@@ -558,7 +558,7 @@ public class LessEqTest
 
         // ---------- test before() ----------
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "2" );
 
@@ -575,7 +575,7 @@ public class LessEqTest
 
         // ---------- test after() ----------
 
-        cursor = new LessEqCursor( store, evaluator );
+        cursor = new LessEqCursor<String>( store, evaluator );
         indexEntry = new IndexEntry<String, String>();
         indexEntry.setKey( "2" );
         try
@@ -599,9 +599,9 @@ public class LessEqTest
     public void testEvaluatorIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID
);
-        LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
+        LessEqNode<String> node = new LessEqNode<String>( at, new StringValue(
at, "3" ) );
 
-        LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
+        LessEqEvaluator<String> evaluator = new LessEqEvaluator<String>( node,
store, schemaManager );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTALCODE_AT_OID, evaluator.getAttributeType().getOid()
);
@@ -645,9 +645,9 @@ public class LessEqTest
     public void testEvaluatorWithDescendantValue() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID
);
-        LessEqNode node = new LessEqNode( at, new StringValue( at, "2" ) );
+        LessEqNode<String> node = new LessEqNode<String>( at, new StringValue(
at, "2" ) );
 
-        LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
+        LessEqEvaluator<String> evaluator = new LessEqEvaluator<String>( node,
store, schemaManager );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.STREET_AT_OID, evaluator.getAttributeType().getOid()
);
@@ -675,9 +675,9 @@ public class LessEqTest
     public void testEvaluatorWithoutDescendants() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.C_POSTALCODE_AT_OID
);
-        LessEqNode node = new LessEqNode( at, new StringValue( at, "2" ) );
+        LessEqNode<String> node = new LessEqNode<String>( at, new StringValue(
at, "2" ) );
 
-        LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
+        LessEqEvaluator<String> evaluator = new LessEqEvaluator<String>( node,
store, schemaManager );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.C_POSTALCODE_AT_OID, evaluator.getAttributeType().getOid()
);
@@ -693,9 +693,9 @@ public class LessEqTest
     public void testEvaluatorNotIndexed() throws Exception
     {
         AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTOFFICEBOX_AT_OID
);
-        LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
+        LessEqNode<String> node = new LessEqNode<String>( at, new StringValue(
at, "3" ) );
 
-        LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
+        LessEqEvaluator<String> evaluator = new LessEqEvaluator<String>( node,
store, schemaManager );
         IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
         assertEquals( node, evaluator.getExpression() );
         assertEquals( SchemaConstants.POSTOFFICEBOX_AT_OID, evaluator.getAttributeType().getOid()
);
@@ -749,9 +749,9 @@ public class LessEqTest
 
         try
         {
-            LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
+            LessEqNode<String> node = new LessEqNode<String>( at, new StringValue(
at, "3" ) );
 
-            new LessEqEvaluator( node, store, schemaManager );
+            new LessEqEvaluator<String>( node, store, schemaManager );
         }
         finally
         {
@@ -788,8 +788,8 @@ public class LessEqTest
         desc.setNames( names );
         desc.setObsolete( false );
 
-        LessEqNode node = new LessEqNode( at, new StringValue( at, "3" ) );
-        new LessEqEvaluator( node, store, schemaManager );
+        LessEqNode<String> node = new LessEqNode<String>( at, new StringValue(
at, "3" ) );
+        new LessEqEvaluator<String>( node, store, schemaManager );
         schemaManager.delete( at );
     }
 }

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=1588658&r1=1588657&r2=1588658&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
Sat Apr 19 15:11:09 2014
@@ -134,8 +134,8 @@ public class NestedFilterTest extends Ab
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
         ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." )
);
         ( ( Partition ) store ).initialize();
 

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1588658&r1=1588657&r2=1588658&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
Sat Apr 19 15:11:09 2014
@@ -135,8 +135,8 @@ public class NotCursorTest extends Abstr
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
         ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." )
);
         ( ( Partition ) store ).initialize();
 

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1588658&r1=1588657&r2=1588658&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
Sat Apr 19 15:11:09 2014
@@ -136,8 +136,8 @@ public class OrCursorTest extends Abstra
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
         ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." )
);
         ( ( Partition ) store ).initialize();
 
@@ -377,7 +377,7 @@ public class OrCursorTest extends Abstra
 
         try
         {
-            cursor.after( new IndexEntry() );
+            cursor.after( new IndexEntry<String, Long>() );
             fail( "should fail with UnsupportedOperationException " );
         }
         catch ( UnsupportedOperationException uoe )
@@ -386,7 +386,7 @@ public class OrCursorTest extends Abstra
 
         try
         {
-            cursor.before( new IndexEntry() );
+            cursor.before( new IndexEntry<String, Long>() );
             fail( "should fail with UnsupportedOperationException " );
         }
         catch ( UnsupportedOperationException uoe )

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1588658&r1=1588657&r2=1588658&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
Sat Apr 19 15:11:09 2014
@@ -131,8 +131,8 @@ public class PresenceTest
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
         ( ( Partition ) store ).setSuffixDn( new Dn( schemaManager, "o=Good Times Co." )
);
         ( ( Partition ) store ).initialize();
 

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1588658&r1=1588657&r2=1588658&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
Sat Apr 19 15:11:09 2014
@@ -127,8 +127,8 @@ public class SubstringTest
         store.setPartitionPath( wkdir.toURI() );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String>( SchemaConstants.CN_AT_OID ) );
 
         Dn suffixDn = new Dn( schemaManager, "o=Good Times Co." );
         ( ( Partition ) store ).setSuffixDn( suffixDn );



Mime
View raw message