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 2014/05/08 20:22:13 UTC
svn commit: r1593359 - in /directory/mavibot/branches/with-txns/mavibot/src:
main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java
test/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializerTest.java
Author: elecharny
Date: Thu May 8 18:22:12 2014
New Revision: 1593359
URL: http://svn.apache.org/r1593359
Log:
o Fixed the LongArray serializer
o Added a test for the LongArraySerializer
Added:
directory/mavibot/branches/with-txns/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializerTest.java
Modified:
directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java
Modified: directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java?rev=1593359&r1=1593358&r2=1593359&view=diff
==============================================================================
--- directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java (original)
+++ directory/mavibot/branches/with-txns/mavibot/src/main/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializer.java Thu May 8 18:22:12 2014
@@ -129,8 +129,9 @@ public class LongArraySerializer extends
default:
long[] longs = new long[len];
+ in = bufferHandler.read( len * 8 );
- int pos = 4;
+ int pos = 0;
for ( int i = 0; i < len; i++ )
{
Added: directory/mavibot/branches/with-txns/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/with-txns/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializerTest.java?rev=1593359&view=auto
==============================================================================
--- directory/mavibot/branches/with-txns/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializerTest.java (added)
+++ directory/mavibot/branches/with-txns/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongArraySerializerTest.java Thu May 8 18:22:12 2014
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.mavibot.btree.serializer;
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.junit.Test;
+
+
+/**
+ * Test the LongArraySerializer class
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class LongArraySerializerTest
+{
+ LongArraySerializer longArraySerializer = LongArraySerializer.INSTANCE;
+ @Test
+ public void testLongArraySerializer() throws IOException
+ {
+ long[] value = null;
+ byte[] result = longArraySerializer.serialize( value );
+
+ assertEquals( 4, result.length );
+ assertEquals( ( byte ) 0xFF, result[0] );
+ assertEquals( ( byte ) 0xFF, result[1] );
+ assertEquals( ( byte ) 0xFF, result[2] );
+ assertEquals( ( byte ) 0xFF, result[3] );
+
+ assertEquals( value, longArraySerializer.deserialize( new BufferHandler( result ) ) );
+
+ // ------------------------------------------------------------------
+ value = new long[]{};
+ result = longArraySerializer.serialize( value );
+
+ assertEquals( 4, result.length );
+ assertEquals( ( byte ) 0x00, result[0] );
+ assertEquals( ( byte ) 0x00, result[1] );
+ assertEquals( ( byte ) 0x00, result[2] );
+ assertEquals( ( byte ) 0x00, result[3] );
+
+ assertTrue( Arrays.equals( value, longArraySerializer.deserialize( new BufferHandler( result ) ) ) );
+
+ // ------------------------------------------------------------------
+ value = new long[]{ 1L };
+ result = longArraySerializer.serialize( value );
+
+ assertEquals( 12, result.length );
+ assertEquals( ( byte ) 0x00, result[0] );
+ assertEquals( ( byte ) 0x00, result[1] );
+ assertEquals( ( byte ) 0x00, result[2] );
+ assertEquals( ( byte ) 0x01, result[3] );
+ assertEquals( ( byte ) 0x00, result[4] );
+ assertEquals( ( byte ) 0x00, result[5] );
+ assertEquals( ( byte ) 0x00, result[6] );
+ assertEquals( ( byte ) 0x00, result[7] );
+ assertEquals( ( byte ) 0x00, result[8] );
+ assertEquals( ( byte ) 0x00, result[9] );
+ assertEquals( ( byte ) 0x00, result[10] );
+ assertEquals( ( byte ) 0x01, result[11] );
+
+ assertTrue( Arrays.equals( value, longArraySerializer.deserialize( new BufferHandler( result ) ) ) );
+
+ // ------------------------------------------------------------------
+ value = new long[]{ 1L, 0x00000000FFFFFFFFL, 0xFFFFFFFFFFFFFFFFL };
+ result = longArraySerializer.serialize( value );
+
+ assertEquals( 28, result.length );
+ assertEquals( ( byte ) 0x00, result[0] );
+ assertEquals( ( byte ) 0x00, result[1] );
+ assertEquals( ( byte ) 0x00, result[2] );
+ assertEquals( ( byte ) 0x03, result[3] );
+ assertEquals( ( byte ) 0x00, result[4] );
+ assertEquals( ( byte ) 0x00, result[5] );
+ assertEquals( ( byte ) 0x00, result[6] );
+ assertEquals( ( byte ) 0x00, result[7] );
+ assertEquals( ( byte ) 0x00, result[8] );
+ assertEquals( ( byte ) 0x00, result[9] );
+ assertEquals( ( byte ) 0x00, result[10] );
+ assertEquals( ( byte ) 0x01, result[11] );
+ assertEquals( ( byte ) 0x00, result[12] );
+ assertEquals( ( byte ) 0x00, result[13] );
+ assertEquals( ( byte ) 0x00, result[14] );
+ assertEquals( ( byte ) 0x00, result[15] );
+ assertEquals( ( byte ) 0xFF, result[16] );
+ assertEquals( ( byte ) 0xFF, result[17] );
+ assertEquals( ( byte ) 0xFF, result[18] );
+ assertEquals( ( byte ) 0xFF, result[19] );
+ assertEquals( ( byte ) 0xFF, result[20] );
+ assertEquals( ( byte ) 0xFF, result[21] );
+ assertEquals( ( byte ) 0xFF, result[22] );
+ assertEquals( ( byte ) 0xFF, result[23] );
+ assertEquals( ( byte ) 0xFF, result[24] );
+ assertEquals( ( byte ) 0xFF, result[25] );
+ assertEquals( ( byte ) 0xFF, result[26] );
+ assertEquals( ( byte ) 0xFF, result[27] );
+
+ assertTrue( Arrays.equals( value, longArraySerializer.deserialize( new BufferHandler( result ) ) ) );
+ }
+}