You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2013/08/09 18:09:27 UTC
svn commit: r1512371 [2/2] - in /directory/mavibot/trunk/mavibot/src:
main/java/org/apache/directory/mavibot/btree/
main/java/org/apache/directory/mavibot/btree/comparator/
main/java/org/apache/directory/mavibot/btree/exception/
main/java/org/apache/di...
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ByteArraySerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ByteArraySerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ByteArraySerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ByteArraySerializer.java Fri Aug 9 16:09:25 2013
@@ -30,7 +30,7 @@ import org.apache.directory.mavibot.btre
/**
* A serializer for a byte[].
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ByteArraySerializer extends AbstractElementSerializer<byte[]>
{
@@ -51,7 +51,7 @@ public class ByteArraySerializer extends
super( comparator );
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ByteSerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ByteSerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ByteSerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ByteSerializer.java Fri Aug 9 16:09:25 2013
@@ -29,7 +29,7 @@ import org.apache.directory.mavibot.btre
/**
* The Byte serializer.
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ByteSerializer extends AbstractElementSerializer<Byte>
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/CharArraySerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/CharArraySerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/CharArraySerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/CharArraySerializer.java Fri Aug 9 16:09:25 2013
@@ -29,7 +29,7 @@ import org.apache.directory.mavibot.btre
/**
* A serializer for a char[].
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CharArraySerializer extends AbstractElementSerializer<char[]>
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/CharSerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/CharSerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/CharSerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/CharSerializer.java Fri Aug 9 16:09:25 2013
@@ -29,7 +29,7 @@ import org.apache.directory.mavibot.btre
/**
* The Character serializer.
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CharSerializer extends AbstractElementSerializer<Character>
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ElementSerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ElementSerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ElementSerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ElementSerializer.java Fri Aug 9 16:09:25 2013
@@ -30,7 +30,7 @@ import java.util.Comparator;
*
* @param <T> The type for the element to serialize and compare
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface ElementSerializer<T>
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/IntSerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/IntSerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/IntSerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/IntSerializer.java Fri Aug 9 16:09:25 2013
@@ -29,7 +29,7 @@ import org.apache.directory.mavibot.btre
/**
* The Integer serializer.
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class IntSerializer extends AbstractElementSerializer<Integer>
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java Fri Aug 9 16:09:25 2013
@@ -30,7 +30,7 @@ import org.apache.directory.mavibot.btre
/**
* A serializer for a Long[].
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LongArraySerializer implements ElementSerializer<long[]>
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongSerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongSerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongSerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongSerializer.java Fri Aug 9 16:09:25 2013
@@ -29,7 +29,7 @@ import org.apache.directory.mavibot.btre
/**
* The Long serializer.
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LongSerializer extends AbstractElementSerializer<Long>
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/Serializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/Serializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/Serializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/Serializer.java Fri Aug 9 16:09:25 2013
@@ -28,7 +28,7 @@ import java.io.IOException;
*
* @param <T> The type for the element to serialize
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface Serializer<T>
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ShortSerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ShortSerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ShortSerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/ShortSerializer.java Fri Aug 9 16:09:25 2013
@@ -29,7 +29,7 @@ import org.apache.directory.mavibot.btre
/**
* The Short serializer.
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ShortSerializer extends AbstractElementSerializer<Short>
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/StringSerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/StringSerializer.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/StringSerializer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/StringSerializer.java Fri Aug 9 16:09:25 2013
@@ -32,12 +32,13 @@ import org.apache.directory.mavibot.btre
/**
* The String serializer.
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StringSerializer extends AbstractElementSerializer<String>
{
public static final StringSerializer INSTANCE = new StringSerializer();
-
+
+
/**
* Create a new instance of StringSerializer
*/
@@ -55,7 +56,7 @@ public class StringSerializer extends Ab
super( comparator );
}
-
+
/**
* A static method used to deserialize a String from a byte array.
* @param in The byte array containing the String
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/util/Strings.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/util/Strings.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/util/Strings.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/util/Strings.java Fri Aug 9 16:09:25 2013
@@ -31,7 +31,7 @@ import java.util.Set;
* string operations: all is done in the same buffer without creating a bunch of
* string objects.
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class Strings
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBuilderTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBuilderTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBuilderTest.java Fri Aug 9 16:09:25 2013
@@ -21,17 +21,14 @@
package org.apache.directory.mavibot.btree;
+import static org.junit.Assert.assertEquals;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.BTreeBuilder;
-import org.apache.directory.mavibot.btree.Cursor;
-import org.apache.directory.mavibot.btree.Tuple;
import org.apache.directory.mavibot.btree.serializer.IntSerializer;
import org.junit.Test;
-import static org.junit.Assert.*;
/**
@@ -58,11 +55,11 @@ public class BTreeBuilderTest
BTree btree = bb.build( sortedTuple.iterator() );
assertEquals( 1, btree.rootPage.getNbElems() );
-
+
assertEquals( 7, btree.rootPage.findRightMost().getKey() );
-
+
assertEquals( 1, btree.rootPage.findLeftMost().getKey() );
-
+
Cursor<Integer, Integer> cursor = btree.browse();
int i = 0;
while ( cursor.hasNext() )
@@ -72,7 +69,7 @@ public class BTreeBuilderTest
assertEquals( expected.getKey(), actual.getKey() );
assertEquals( expected.getValue(), actual.getValue() );
}
-
+
cursor.close();
btree.close();
}
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeConfigurationTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeConfigurationTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeConfigurationTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeConfigurationTest.java Fri Aug 9 16:09:25 2013
@@ -25,8 +25,6 @@ import static org.junit.Assert.assertNot
import java.io.File;
import java.io.IOException;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.BTreeConfiguration;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.mavibot.btree.serializer.IntSerializer;
import org.apache.directory.mavibot.btree.serializer.StringSerializer;
@@ -36,7 +34,7 @@ import org.junit.Test;
/**
* Test the creation of a BTree with a configuration.
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class BTreeConfigurationTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeDuplicateKeyTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeDuplicateKeyTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeDuplicateKeyTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeDuplicateKeyTest.java Fri Aug 9 16:09:25 2013
@@ -31,10 +31,6 @@ import java.io.IOException;
import java.util.NoSuchElementException;
import java.util.UUID;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.BTreeConfiguration;
-import org.apache.directory.mavibot.btree.Cursor;
-import org.apache.directory.mavibot.btree.Tuple;
import org.apache.directory.mavibot.btree.serializer.IntSerializer;
import org.apache.directory.mavibot.btree.serializer.StringSerializer;
import org.junit.Test;
@@ -255,7 +251,7 @@ public class BTreeDuplicateKeyTest
int i = 7;
for ( char ch = 'a'; ch <= 'z'; ch++ )
{
- for( int k = 0; k< i; k++ )
+ for ( int k = 0; k < i; k++ )
{
btree.insert( String.valueOf( ch ), UUID.randomUUID().toString() );
}
@@ -265,39 +261,40 @@ public class BTreeDuplicateKeyTest
char ch = 'a';
int k = 0;
-
+
while ( cursor.hasNext() )
{
Tuple<String, String> t = cursor.next();
assertEquals( String.valueOf( ch ), t.getKey() );
k++;
-
- if( ( k % i ) == 0 )
+
+ if ( ( k % i ) == 0 )
{
ch++;
}
}
-
- assertEquals( ( 'z' + 1 ) , ch );
-
+
+ assertEquals( ( 'z' + 1 ), ch );
+
ch = 'z';
-
- while(cursor.hasPrev())
+
+ while ( cursor.hasPrev() )
{
Tuple<String, String> t = cursor.prev();
assertEquals( String.valueOf( ch ), t.getKey() );
k--;
-
- if( ( k % i ) == 0 )
+
+ if ( ( k % i ) == 0 )
{
ch--;
}
}
- assertEquals( ( 'a' - 1 ) , ch );
+ assertEquals( ( 'a' - 1 ), ch );
cursor.close();
}
+
@Test
public void testMoveFirst() throws Exception
{
@@ -316,49 +313,49 @@ public class BTreeDuplicateKeyTest
// add one more value for 'a'
btree.insert( String.valueOf( 'a' ), UUID.randomUUID().toString() );
-
+
Cursor<String, String> cursor = btree.browseFrom( "c" );
int i = 0;
- while( cursor.hasNext() )
+ while ( cursor.hasNext() )
{
assertNotNull( cursor.next() );
i++;
}
assertEquals( 24, i );
-
+
// now move the cursor first
cursor.beforeFirst();
assertTrue( cursor.hasNext() );
assertEquals( "c", cursor.next().getKey() );
-
+
i = 0;
- while( cursor.hasNext() )
+ while ( cursor.hasNext() )
{
assertNotNull( cursor.next() );
i++;
}
assertEquals( 23, i );
-
+
cursor.close();
-
+
cursor = btree.browse();
-
+
i = 0;
- while( cursor.hasNext() )
+ while ( cursor.hasNext() )
{
assertNotNull( cursor.next() );
i++;
}
assertEquals( 27, i );
-
+
// now move the cursor first
cursor.beforeFirst();
assertTrue( cursor.hasNext() );
assertEquals( "a", cursor.next().getKey() );
-
+
i = 0;
- while( cursor.hasNext() )
+ while ( cursor.hasNext() )
{
assertNotNull( cursor.next() );
i++;
@@ -382,18 +379,18 @@ public class BTreeDuplicateKeyTest
{
btree.insert( String.valueOf( ch ), UUID.randomUUID().toString() );
}
-
+
btree.insert( String.valueOf( 'z' ), UUID.randomUUID().toString() );
-
+
Cursor<String, String> cursor = btree.browseFrom( "c" );
cursor.afterLast();
-
+
assertFalse( cursor.hasNext() );
assertTrue( cursor.hasPrev() );
assertEquals( "z", cursor.prev().getKey() );
assertEquals( "z", cursor.prev().getKey() );
assertEquals( "y", cursor.prev().getKey() );
-
+
cursor.beforeFirst();
assertEquals( "c", cursor.next().getKey() );
@@ -403,7 +400,7 @@ public class BTreeDuplicateKeyTest
cursor.next();
}
-
+
@Test(expected = NoSuchElementException.class)
public void testMoveToNextPrevNonDuplicateKey() throws Exception
{
@@ -418,27 +415,27 @@ public class BTreeDuplicateKeyTest
int i = 7;
for ( char ch = 'a'; ch <= 'z'; ch++ )
{
- for( int k = 0; k< i; k++ )
+ for ( int k = 0; k < i; k++ )
{
btree.insert( String.valueOf( ch ), String.valueOf( k ) );
}
}
-
+
Cursor<String, String> cursor = btree.browse();
assertTrue( cursor.hasNext() );
assertFalse( cursor.hasPrev() );
- for(int k =0; k < 2; k++)
+ for ( int k = 0; k < 2; k++ )
{
assertEquals( "a", cursor.next().getKey() );
}
-
+
assertEquals( "a", cursor.next().getKey() );
-
+
cursor.moveToNextNonDuplicateKey();
-
+
assertEquals( "b", cursor.next().getKey() );
-
+
for ( char ch = 'b'; ch < 'z'; ch++ )
{
assertEquals( String.valueOf( ch ), cursor.next().getKey() );
@@ -447,7 +444,7 @@ public class BTreeDuplicateKeyTest
assertEquals( String.valueOf( ++t ), cursor.next().getKey() );
}
- for(int k =0; k < i-1; k++)
+ for ( int k = 0; k < i - 1; k++ )
{
assertEquals( "z", cursor.next().getKey() );
}
@@ -457,21 +454,21 @@ public class BTreeDuplicateKeyTest
Tuple<String, String> tuple = cursor.prev();
assertEquals( "z", tuple.getKey() );
assertEquals( "6", tuple.getValue() );
-
+
for ( char ch = 'z'; ch > 'a'; ch-- )
{
char t = ch;
t--;
-
+
assertEquals( String.valueOf( ch ), cursor.prev().getKey() );
-
+
cursor.moveToPrevNonDuplicateKey();
tuple = cursor.prev();
assertEquals( String.valueOf( t ), tuple.getKey() );
}
-
- for(int k =5; k >=0; k--)
+
+ for ( int k = 5; k >= 0; k-- )
{
tuple = cursor.prev();
assertEquals( "a", tuple.getKey() );
@@ -485,23 +482,23 @@ public class BTreeDuplicateKeyTest
assertEquals( "0", tuple.getValue() );
cursor.close();
-
- cursor = btree.browseFrom("y");
+
+ cursor = btree.browseFrom( "y" );
cursor.moveToNextNonDuplicateKey();
assertTrue( cursor.hasPrev() );
tuple = cursor.prev();
assertEquals( "y", tuple.getKey() );
assertEquals( "6", tuple.getValue() );
cursor.close();
-
+
cursor = btree.browse();
cursor.beforeFirst();
assertFalse( cursor.hasPrev() );
// make sure it throws NoSuchElementException
cursor.prev();
}
-
-
+
+
/**
* Test for moving between two leaves. When moveToNextNonDuplicateKey is called
* and cursor is on the last element of the current leaf.
@@ -521,13 +518,13 @@ public class BTreeDuplicateKeyTest
BTree<Integer, Integer> btree = new BTree<Integer, Integer>( config );
int i = 7;
- for ( int k=0; k < i; k++ )
+ for ( int k = 0; k < i; k++ )
{
btree.insert( k, k );
}
-
+
// 3 is the last element of the first leaf
- Cursor<Integer, Integer> cursor = btree.browseFrom(3);
+ Cursor<Integer, Integer> cursor = btree.browseFrom( 3 );
cursor.moveToNextNonDuplicateKey();
assertTrue( cursor.hasNext() );
@@ -536,7 +533,7 @@ public class BTreeDuplicateKeyTest
assertEquals( Integer.valueOf( 4 ), tuple.getValue() );
cursor.close();
- cursor = btree.browseFrom(3);
+ cursor = btree.browseFrom( 3 );
cursor.moveToNextNonDuplicateKey();
assertTrue( cursor.hasPrev() );
@@ -544,26 +541,26 @@ public class BTreeDuplicateKeyTest
assertEquals( Integer.valueOf( 3 ), tuple.getKey() );
assertEquals( Integer.valueOf( 3 ), tuple.getValue() );
cursor.close();
-
+
// 4 is the first element of the second leaf
- cursor = btree.browseFrom(4);
+ cursor = btree.browseFrom( 4 );
cursor.moveToPrevNonDuplicateKey();
assertTrue( cursor.hasPrev() );
tuple = cursor.prev();
assertEquals( Integer.valueOf( 3 ), tuple.getKey() );
assertEquals( Integer.valueOf( 3 ), tuple.getValue() );
-
+
// the below assertion won't work cause of the index position
// issue when prev() and next() are called subsequently (in any order)
-// assertTrue( cursor.hasNext() );
-// tuple = cursor.next();
-// assertEquals( Integer.valueOf( 4 ), tuple.getKey() );
-// assertEquals( Integer.valueOf( 4 ), tuple.getValue() );
+ // assertTrue( cursor.hasNext() );
+ // tuple = cursor.next();
+ // assertEquals( Integer.valueOf( 4 ), tuple.getKey() );
+ // assertEquals( Integer.valueOf( 4 ), tuple.getValue() );
cursor.close();
-
+
// test the extremes of the BTree instead of that of leaves
- cursor = btree.browseFrom(6);
+ cursor = btree.browseFrom( 6 );
cursor.moveToNextNonDuplicateKey();
assertFalse( cursor.hasNext() );
assertTrue( cursor.hasPrev() );
@@ -571,7 +568,7 @@ public class BTreeDuplicateKeyTest
assertEquals( Integer.valueOf( 6 ), tuple.getKey() );
assertEquals( Integer.valueOf( 6 ), tuple.getValue() );
cursor.close();
-
+
cursor = btree.browse();
cursor.moveToPrevNonDuplicateKey();
assertTrue( cursor.hasNext() );
@@ -581,8 +578,8 @@ public class BTreeDuplicateKeyTest
assertEquals( Integer.valueOf( 0 ), tuple.getValue() );
cursor.close();
}
-
-
+
+
@Test
public void testNextAfterPrev() throws Exception
{
@@ -596,19 +593,19 @@ public class BTreeDuplicateKeyTest
BTree<Integer, Integer> btree = new BTree<Integer, Integer>( config );
int i = 7;
- for ( int k=0; k < i; k++ )
+ for ( int k = 0; k < i; k++ )
{
btree.insert( k, k );
}
-
+
// 3 is the last element of the first leaf
- Cursor<Integer, Integer> cursor = btree.browseFrom(4);
+ Cursor<Integer, Integer> cursor = btree.browseFrom( 4 );
assertTrue( cursor.hasNext() );
Tuple<Integer, Integer> tuple = cursor.next();
assertEquals( Integer.valueOf( 4 ), tuple.getKey() );
assertEquals( Integer.valueOf( 4 ), tuple.getValue() );
-
+
assertTrue( cursor.hasPrev() );
tuple = cursor.prev();
assertEquals( Integer.valueOf( 4 ), tuple.getKey() );
@@ -621,8 +618,8 @@ public class BTreeDuplicateKeyTest
cursor.close();
}
-
-
+
+
/**
* Test for moving after a key and traversing backwards.
*
@@ -641,26 +638,26 @@ public class BTreeDuplicateKeyTest
BTree<Integer, Integer> btree = new BTree<Integer, Integer>( config );
int i = 5;
- for ( int k=0; k < i; k++ )
+ for ( int k = 0; k < i; k++ )
{
btree.insert( k, k );
}
-
+
// 4 is the last element in the tree
- Cursor<Integer, Integer> cursor = btree.browseFrom(4);
+ Cursor<Integer, Integer> cursor = btree.browseFrom( 4 );
cursor.moveToNextNonDuplicateKey();
-
+
int currentKey = 4;
- while( cursor.hasPrev() )
+ while ( cursor.hasPrev() )
{
- assertEquals( Integer.valueOf( currentKey ), cursor.prev().getKey() );
- currentKey--;
+ assertEquals( Integer.valueOf( currentKey ), cursor.prev().getKey() );
+ currentKey--;
}
-
+
cursor.close();
}
-
-
+
+
/**
* Test for moving after a key and traversing backwards.
*
@@ -679,22 +676,22 @@ public class BTreeDuplicateKeyTest
BTree<Integer, Integer> btree = new BTree<Integer, Integer>( config );
int i = 5;
- for ( int k=0; k < i; k++ )
+ for ( int k = 0; k < i; k++ )
{
btree.insert( k, k );
}
-
+
// 4 is the last element in the tree
- Cursor<Integer, Integer> cursor = btree.browseFrom(0);
+ Cursor<Integer, Integer> cursor = btree.browseFrom( 0 );
cursor.moveToPrevNonDuplicateKey();
-
+
int currentKey = 0;
- while( cursor.hasNext() )
+ while ( cursor.hasNext() )
{
- assertEquals( Integer.valueOf( currentKey ), cursor.next().getKey() );
- currentKey++;
+ assertEquals( Integer.valueOf( currentKey ), cursor.next().getKey() );
+ currentKey++;
}
-
+
cursor.close();
}
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeFlushTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeFlushTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeFlushTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeFlushTest.java Fri Aug 9 16:09:25 2013
@@ -29,9 +29,6 @@ import java.io.IOException;
import java.util.Random;
import java.util.Set;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.Cursor;
-import org.apache.directory.mavibot.btree.Tuple;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.mavibot.btree.serializer.IntSerializer;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
@@ -42,7 +39,7 @@ import org.junit.Test;
/**
* A unit test class for BTree flush() operation
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class BTreeFlushTest
{
@@ -220,12 +217,13 @@ public class BTreeFlushTest
String path = tempFile.getParent();
tempFile.delete();
- BTree<Integer, String> btree = new BTree<Integer, String>( "test", path, new IntSerializer(), new StringSerializer() );
+ BTree<Integer, String> btree = new BTree<Integer, String>( "test", path, new IntSerializer(),
+ new StringSerializer() );
btree.setPageSize( 8 );
-
+
File journal = btree.getJournal();
File data = btree.getFile();
-
+
try
{
// Inject the values
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java Fri Aug 9 16:09:25 2013
@@ -35,14 +35,6 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.BTreeConfiguration;
-import org.apache.directory.mavibot.btree.Cursor;
-import org.apache.directory.mavibot.btree.Leaf;
-import org.apache.directory.mavibot.btree.MemoryHolder;
-import org.apache.directory.mavibot.btree.Node;
-import org.apache.directory.mavibot.btree.Page;
-import org.apache.directory.mavibot.btree.Tuple;
import org.apache.directory.mavibot.btree.exception.EndOfFileExceededException;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.mavibot.btree.serializer.IntSerializer;
@@ -55,7 +47,7 @@ import org.junit.Test;
/**
* A unit test class for in-memory BTree
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class InMemoryBTreeTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTestOps.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTestOps.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTestOps.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTestOps.java Fri Aug 9 16:09:25 2013
@@ -23,7 +23,6 @@ package org.apache.directory.mavibot.btr
import java.io.IOException;
import java.util.Random;
-import org.apache.directory.mavibot.btree.BTree;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
import org.apache.directory.mavibot.btree.serializer.StringSerializer;
import org.junit.AfterClass;
@@ -34,7 +33,7 @@ import org.junit.Test;
/**
* A class to test multi-threaded operations on the btree
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class InMemoryBTreeTestOps
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/LeafTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/LeafTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/LeafTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/LeafTest.java Fri Aug 9 16:09:25 2013
@@ -26,20 +26,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.BorrowedFromLeftResult;
-import org.apache.directory.mavibot.btree.BorrowedFromRightResult;
-import org.apache.directory.mavibot.btree.DeleteResult;
-import org.apache.directory.mavibot.btree.InsertResult;
-import org.apache.directory.mavibot.btree.Leaf;
-import org.apache.directory.mavibot.btree.MergedWithSiblingResult;
-import org.apache.directory.mavibot.btree.ModifyResult;
-import org.apache.directory.mavibot.btree.Node;
-import org.apache.directory.mavibot.btree.NotPresentResult;
-import org.apache.directory.mavibot.btree.Page;
-import org.apache.directory.mavibot.btree.ReferenceHolder;
-import org.apache.directory.mavibot.btree.RemoveResult;
-import org.apache.directory.mavibot.btree.Tuple;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
import org.apache.directory.mavibot.btree.serializer.StringSerializer;
@@ -51,7 +37,7 @@ import org.junit.Test;
/**
* A unit test class for Leaf
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LeafTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/MultiThreadedBtreeTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/MultiThreadedBtreeTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/MultiThreadedBtreeTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/MultiThreadedBtreeTest.java Fri Aug 9 16:09:25 2013
@@ -27,9 +27,6 @@ import java.io.IOException;
import java.util.Random;
import java.util.concurrent.CountDownLatch;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.Cursor;
-import org.apache.directory.mavibot.btree.Tuple;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
import org.apache.directory.mavibot.btree.serializer.StringSerializer;
@@ -41,7 +38,7 @@ import org.junit.Test;
/**
* A class to test multi-threaded operations on the btree
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class MultiThreadedBtreeTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/ReadTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/ReadTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/ReadTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/ReadTest.java Fri Aug 9 16:09:25 2013
@@ -27,15 +27,13 @@ import java.io.File;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
-import org.apache.directory.mavibot.btree.PageIO;
-import org.apache.directory.mavibot.btree.RecordManager;
import org.junit.Test;
/**
* Test the RecordManager.readXXX() methods using reflection
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ReadTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java Fri Aug 9 16:09:25 2013
@@ -28,10 +28,6 @@ import java.io.IOException;
import java.util.Set;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.Cursor;
-import org.apache.directory.mavibot.btree.RecordManager;
-import org.apache.directory.mavibot.btree.Tuple;
import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
import org.apache.directory.mavibot.btree.serializer.StringSerializer;
@@ -42,7 +38,7 @@ import org.junit.Test;
/**
* test the RecordManager's free page management
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class RecordManagerFreePageTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java Fri Aug 9 16:09:25 2013
@@ -28,9 +28,6 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.util.UUID;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.PageIO;
-import org.apache.directory.mavibot.btree.RecordManager;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
import org.apache.directory.mavibot.btree.serializer.StringSerializer;
import org.junit.After;
@@ -42,11 +39,12 @@ import org.junit.rules.TemporaryFolder;
/**
* Test some of the RecordManager prvate methods
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class RecordManagerPrivateMethodTest
{
-
+
private BTree<Long, String> btree = null;
private RecordManager recordManager = null;
@@ -61,12 +59,12 @@ public class RecordManagerPrivateMethodT
public void createRecordManager() throws Exception
{
dataDir = tempFolder.newFolder( UUID.randomUUID().toString() );
-
+
// Now, try to reload the file back
recordManager = new RecordManager( dataDir.getAbsolutePath(), 32 );
// Create a new BTree
- btree = ( BTree<Long, String> ) recordManager.addBTree( "test", new LongSerializer(), new StringSerializer(), false );
+ btree = recordManager.addBTree( "test", new LongSerializer(), new StringSerializer(), false );
}
@@ -75,8 +73,8 @@ public class RecordManagerPrivateMethodT
{
recordManager.close();
}
-
-
+
+
/**
* Test the getFreePageIOs method
*/
@@ -87,28 +85,28 @@ public class RecordManagerPrivateMethodT
Method getFreePageIOsMethod = RecordManager.class.getDeclaredMethod( "getFreePageIOs", int.class );
getFreePageIOsMethod.setAccessible( true );
- PageIO[] pages = (org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, 0 );
+ PageIO[] pages = ( org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, 0 );
assertEquals( 0, pages.length );
for ( int i = 1; i < 20; i++ )
{
- pages = (org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
+ pages = ( org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
assertEquals( 1, pages.length );
}
for ( int i = 21; i < 44; i++ )
{
- pages = (org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
+ pages = ( org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
assertEquals( 2, pages.length );
}
for ( int i = 45; i < 68; i++ )
{
- pages = (org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
+ pages = ( org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
assertEquals( 3, pages.length );
}
-
+
btree.close();
}
@@ -139,7 +137,7 @@ public class RecordManagerPrivateMethodT
{
assertEquals( 3, ( ( Integer ) computeNbPagesMethod.invoke( recordManager, i ) ).intValue() );
}
-
+
btree.close();
}
}
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java Fri Aug 9 16:09:25 2013
@@ -34,10 +34,6 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.Cursor;
-import org.apache.directory.mavibot.btree.RecordManager;
-import org.apache.directory.mavibot.btree.Tuple;
import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
@@ -50,9 +46,9 @@ import org.junit.rules.TemporaryFolder;
/**
* test the RecordManager
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-//@Ignore("ignoring till RM functionality is standardized")
public class RecordManagerTest
{
private BTree<Long, String> btree = null;
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java Fri Aug 9 16:09:25 2013
@@ -29,8 +29,6 @@ import java.io.IOException;
import java.util.Set;
import java.util.UUID;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.RecordManager;
import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
@@ -43,9 +41,9 @@ import org.junit.rules.TemporaryFolder;
/**
* test the RecordManager whith duplicate values
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-//@Ignore("ignoring till RM functionality is standardized")
public class RecordManagerWithDuplicatesTest
{
private BTree<Long, String> btree = null;
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/StoreTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/StoreTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/StoreTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/StoreTest.java Fri Aug 9 16:09:25 2013
@@ -26,15 +26,13 @@ import java.io.File;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
-import org.apache.directory.mavibot.btree.PageIO;
-import org.apache.directory.mavibot.btree.RecordManager;
import org.junit.Test;
/**
* Test the RecordManager.store() method using reflection
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StoreTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/BooleanArrayComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/BooleanArrayComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/BooleanArrayComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/BooleanArrayComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.BooleanArrayComparator;
import org.junit.Test;
/**
* Test the BooleanArrayComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class BooleanArrayComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/BooleanComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/BooleanComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/BooleanComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/BooleanComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.BooleanComparator;
import org.junit.Test;
/**
* Test the BooleanComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class BooleanComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ByteArrayComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ByteArrayComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ByteArrayComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ByteArrayComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.ByteArrayComparator;
import org.junit.Test;
/**
* Test the ByteArrayComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ByteArrayComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ByteComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ByteComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ByteComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ByteComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.ByteComparator;
import org.junit.Test;
/**
* Test the ByteComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ByteComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/CharArrayComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/CharArrayComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/CharArrayComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/CharArrayComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.CharArrayComparator;
import org.junit.Test;
/**
* Test the CharArrayComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CharArrayComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/CharComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/CharComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/CharComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/CharComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.CharComparator;
import org.junit.Test;
/**
* Test the CharComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CharComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/IntArrayComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/IntArrayComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/IntArrayComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/IntArrayComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.IntArrayComparator;
import org.junit.Test;
/**
* Test the IntArrayComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class IntArrayComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/IntComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/IntComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/IntComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/IntComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.IntComparator;
import org.junit.Test;
/**
* Test the IntComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class IntComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/LongArrayComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/LongArrayComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/LongArrayComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/LongArrayComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.LongArrayComparator;
import org.junit.Test;
/**
* Test the LongArrayComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LongArrayComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/LongComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/LongComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/LongComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/LongComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.LongComparator;
import org.junit.Test;
/**
* Test the LongComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LongComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/RevisionNameComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/RevisionNameComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/RevisionNameComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/RevisionNameComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -30,7 +30,7 @@ import org.junit.Test;
/**
* Test the RevisionNameComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class RevisionNameComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ShortArrayComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ShortArrayComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ShortArrayComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ShortArrayComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.ShortArrayComparator;
import org.junit.Test;
/**
* Test the ShortArrayComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ShortArrayComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ShortComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ShortComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ShortComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/ShortComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.ShortComparator;
import org.junit.Test;
/**
* Test the ShortComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ShortComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/StringComparatorTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/StringComparatorTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/StringComparatorTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/comparator/StringComparatorTest.java Fri Aug 9 16:09:25 2013
@@ -22,14 +22,13 @@ package org.apache.directory.mavibot.btr
import static org.junit.Assert.assertEquals;
-import org.apache.directory.mavibot.btree.comparator.StringComparator;
import org.junit.Test;
/**
* Test the StringComparator class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StringComparatorTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/BooleanSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/BooleanSerializerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/BooleanSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/BooleanSerializerTest.java Fri Aug 9 16:09:25 2013
@@ -24,15 +24,13 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
-import org.apache.directory.mavibot.btree.serializer.BooleanSerializer;
-import org.apache.directory.mavibot.btree.serializer.BufferHandler;
import org.junit.Test;
/**
* Test the BooleanSerializer class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class BooleanSerializerTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ByteArraySerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ByteArraySerializerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ByteArraySerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ByteArraySerializerTest.java Fri Aug 9 16:09:25 2013
@@ -26,15 +26,13 @@ import static org.junit.Assert.assertTru
import java.io.IOException;
import java.util.Arrays;
-import org.apache.directory.mavibot.btree.serializer.BufferHandler;
-import org.apache.directory.mavibot.btree.serializer.ByteArraySerializer;
import org.junit.Test;
/**
* Test the BytesSerializer class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ByteArraySerializerTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ByteSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ByteSerializerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ByteSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ByteSerializerTest.java Fri Aug 9 16:09:25 2013
@@ -24,15 +24,13 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
-import org.apache.directory.mavibot.btree.serializer.BufferHandler;
-import org.apache.directory.mavibot.btree.serializer.ByteSerializer;
import org.junit.Test;
/**
* Test the ByteSerializer class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ByteSerializerTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/CharSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/CharSerializerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/CharSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/CharSerializerTest.java Fri Aug 9 16:09:25 2013
@@ -24,15 +24,13 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
-import org.apache.directory.mavibot.btree.serializer.BufferHandler;
-import org.apache.directory.mavibot.btree.serializer.CharSerializer;
import org.junit.Test;
/**
* Test the CharSerializer class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CharSerializerTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/IntSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/IntSerializerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/IntSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/IntSerializerTest.java Fri Aug 9 16:09:25 2013
@@ -24,15 +24,13 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
-import org.apache.directory.mavibot.btree.serializer.BufferHandler;
-import org.apache.directory.mavibot.btree.serializer.IntSerializer;
import org.junit.Test;
/**
* Test the IntSerializer class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class IntSerializerTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongSerializerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongSerializerTest.java Fri Aug 9 16:09:25 2013
@@ -24,15 +24,13 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
-import org.apache.directory.mavibot.btree.serializer.BufferHandler;
-import org.apache.directory.mavibot.btree.serializer.LongSerializer;
import org.junit.Test;
/**
* Test the LongSerializer class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LongSerializerTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/RevisionNameSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/RevisionNameSerializerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/RevisionNameSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/RevisionNameSerializerTest.java Fri Aug 9 16:09:25 2013
@@ -28,16 +28,13 @@ import java.io.IOException;
import org.apache.directory.mavibot.btree.RevisionName;
import org.apache.directory.mavibot.btree.RevisionNameSerializer;
-import org.apache.directory.mavibot.btree.serializer.BufferHandler;
-import org.apache.directory.mavibot.btree.serializer.LongSerializer;
-import org.apache.directory.mavibot.btree.serializer.StringSerializer;
import org.junit.Test;
/**
* Test the RevisionNameSerializer class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class RevisionNameSerializerTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ShortSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ShortSerializerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ShortSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ShortSerializerTest.java Fri Aug 9 16:09:25 2013
@@ -24,15 +24,13 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
-import org.apache.directory.mavibot.btree.serializer.BufferHandler;
-import org.apache.directory.mavibot.btree.serializer.ShortSerializer;
import org.junit.Test;
/**
* Test the ShortSerializer class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ShortSerializerTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/StringSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/StringSerializerTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/StringSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/StringSerializerTest.java Fri Aug 9 16:09:25 2013
@@ -24,15 +24,13 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
-import org.apache.directory.mavibot.btree.serializer.BufferHandler;
-import org.apache.directory.mavibot.btree.serializer.StringSerializer;
import org.junit.Test;
/**
* Test the StringSerializer class
*
- * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StringSerializerTest
{
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/util/BulkDataSorterTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/util/BulkDataSorterTest.java?rev=1512371&r1=1512370&r2=1512371&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/util/BulkDataSorterTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/util/BulkDataSorterTest.java Fri Aug 9 16:09:25 2013
@@ -19,6 +19,7 @@
*/
package org.apache.directory.mavibot.btree.util;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -32,10 +33,9 @@ import java.util.Iterator;
import java.util.Random;
import org.apache.directory.mavibot.btree.Tuple;
-import org.apache.directory.mavibot.btree.util.BulkDataSorter;
-import org.apache.directory.mavibot.btree.util.IntTupleReaderWriter;
import org.junit.Test;
+
/**
* Test cases for BulkDataSorter.
*
@@ -46,7 +46,7 @@ public class BulkDataSorterTest
private Comparator<Tuple<Integer, Integer>> tupleComp = new Comparator<Tuple<Integer, Integer>>()
{
-
+
@Override
public int compare( Tuple<Integer, Integer> o1, Tuple<Integer, Integer> o2 )
{
@@ -54,42 +54,43 @@ public class BulkDataSorterTest
}
};
-
+
@Test
public void testSortedFileCount() throws IOException
{
int count = 7;
IntTupleReaderWriter itrw = new IntTupleReaderWriter();
Random random = new Random();
-
+
File dataFile = File.createTempFile( "tuple", ".data" );
dataFile.deleteOnExit();
DataOutputStream out = new DataOutputStream( new FileOutputStream( dataFile ) );
-
- Tuple<Integer, Integer>[] arr = (Tuple<Integer, Integer>[]) Array.newInstance( Tuple.class, count );
-
+
+ Tuple<Integer, Integer>[] arr = ( Tuple<Integer, Integer>[] ) Array.newInstance( Tuple.class, count );
+
for ( int i = 0; i < count; i++ )
{
- int x = random.nextInt(100);
+ int x = random.nextInt( 100 );
//System.out.println(x);
Tuple<Integer, Integer> t = new Tuple<Integer, Integer>( x, x );
-
+
arr[i] = t;
-
+
itrw.writeTuple( t, out );
}
out.close();
-
+
BulkDataSorter<Integer, Integer> bds = new BulkDataSorter<Integer, Integer>( itrw, tupleComp, 4 );
bds.sort( dataFile );
-
- assertEquals(2, bds.getWorkDir().list().length);
-
+
+ assertEquals( 2, bds.getWorkDir().list().length );
+
deleteDir( bds.getWorkDir() );
}
-
+
+
@Test
public void testSortedFileMerge() throws IOException
{
@@ -100,50 +101,51 @@ public class BulkDataSorterTest
testSortedFileMerge( 10000, 101 );
testSortedFileMerge( 100000, 501 );
}
-
- public void testSortedFileMerge(int count, int splitAfter) throws IOException
+
+
+ public void testSortedFileMerge( int count, int splitAfter ) throws IOException
{
IntTupleReaderWriter itrw = new IntTupleReaderWriter();
Random random = new Random();
-
+
File dataFile = File.createTempFile( "tuple", ".data" );
dataFile.deleteOnExit();
-
+
DataOutputStream out = new DataOutputStream( new FileOutputStream( dataFile ) );
-
- Tuple<Integer, Integer>[] arr = (Tuple<Integer, Integer>[]) Array.newInstance( Tuple.class, count );
-
+
+ Tuple<Integer, Integer>[] arr = ( Tuple<Integer, Integer>[] ) Array.newInstance( Tuple.class, count );
+
int randUpper = count;
- if(count < 100)
+ if ( count < 100 )
{
randUpper = 100;
}
-
+
for ( int i = 0; i < count; i++ )
{
- int x = random.nextInt(randUpper);
+ int x = random.nextInt( randUpper );
//System.out.println(x);
Tuple<Integer, Integer> t = new Tuple<Integer, Integer>( x, x );
-
+
arr[i] = t;
-
+
itrw.writeTuple( t, out );
}
out.close();
-
+
BulkDataSorter<Integer, Integer> bds = new BulkDataSorter<Integer, Integer>( itrw, tupleComp, splitAfter );
bds.sort( dataFile );
-
- Iterator<Tuple<Integer,Integer>> itr = bds.getMergeSortedTuples();
-
+
+ Iterator<Tuple<Integer, Integer>> itr = bds.getMergeSortedTuples();
+
Integer prev = null;
- while(itr.hasNext())
+ while ( itr.hasNext() )
{
- Tuple<Integer,Integer> t = itr.next();
-
- if(prev == null)
+ Tuple<Integer, Integer> t = itr.next();
+
+ if ( prev == null )
{
prev = t.getKey();
}
@@ -151,28 +153,28 @@ public class BulkDataSorterTest
{
assertTrue( prev <= t.getKey() );
}
-
+
//System.out.println(t);
}
-
+
deleteDir( bds.getWorkDir() );
}
-
-
- private void deleteDir(File dir)
+
+
+ private void deleteDir( File dir )
{
- if(dir.isFile())
+ if ( dir.isFile() )
{
dir.delete();
}
-
+
File[] files = dir.listFiles();
-
- for(File f: files)
+
+ for ( File f : files )
{
f.delete();
}
-
+
dir.delete();
}
}