You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by el...@apache.org on 2012/08/02 17:52:31 UTC
svn commit: r1368563 - in /labs/mavibot/trunk/mavibot/src:
main/java/org/apache/mavibot/btree/serializer/
test/java/org/apache/mavibot/btree/serializer/
Author: elecharny
Date: Thu Aug 2 15:52:30 2012
New Revision: 1368563
URL: http://svn.apache.org/viewvc?rev=1368563&view=rev
Log:
o Modified the parameters we pass to the deserialize() method, in order to be able to use some buffering between the file and the byte[]
o Added a BufferHandler structure used to bufferize data from the disk and to provide byte[] on demand to teh deserializers
Added:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BufferHandler.java
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BooleanSerializer.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ByteSerializer.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/CharSerializer.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/DefaultSerializer.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ElementSerializer.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/IntSerializer.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/LongSerializer.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/Serializer.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ShortSerializer.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/StringSerializer.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/BooleanSerializerTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ByteSerializerTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/CharSerializerTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/DefaultSerializerTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/IntSerializerTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/LongSerializerTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ShortSerializerTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/StringSerializerTest.java
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BooleanSerializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BooleanSerializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BooleanSerializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BooleanSerializer.java Thu Aug 2 15:52:30 2012
@@ -20,6 +20,9 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
+
+
/**
* The Boolean serializer.
*
@@ -42,8 +45,10 @@ public class BooleanSerializer implement
/**
* {@inheritDoc}
*/
- public Boolean deserialize( byte[] in )
+ public Boolean deserialize( BufferHandler bufferHandler ) throws IOException
{
+ byte[] in = bufferHandler.read( 1 );
+
return in[0] == 0x01;
}
}
Added: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BufferHandler.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BufferHandler.java?rev=1368563&view=auto
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BufferHandler.java (added)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/BufferHandler.java Thu Aug 2 15:52:30 2012
@@ -0,0 +1,104 @@
+/*
+ * 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.mavibot.btree.serializer;
+
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+
+/**
+ * A class used to hide the buffer read from the underlying file.
+ *
+ * @author <a href="mailto:labs@labs.apache.org">Mavibot labs Project</a>
+ */
+public class BufferHandler
+{
+ /** The channel we read bytes from */
+ private FileChannel channel;
+
+ /** The buffer containing the bytes we read from the channel */
+ private ByteBuffer buffer;
+
+
+ /**
+ * Create a new BufferHandler
+ * @param buffer The buffer used to transfer data
+ */
+ public BufferHandler( byte[] buffer )
+ {
+ this.buffer = ByteBuffer.allocate( buffer.length );
+ this.buffer.put( buffer );
+ this.buffer.flip();
+ }
+
+
+ /**
+ * Create a new BufferHandler
+ * @param channel The channel to read
+ * @param buffer The buffer used to transfer data
+ */
+ public BufferHandler( FileChannel channel, ByteBuffer buffer )
+ {
+ this.channel = channel;
+ this.buffer = buffer;
+ }
+
+
+ /**
+ * Read a buffer containing the given number of bytes
+ * @param len The number of bytes to read
+ * @return
+ */
+ public byte[] read( int len ) throws IOException
+ {
+ byte[] result = new byte[len];
+
+ if ( len <= buffer.remaining() )
+ {
+ return buffer.get( result ).array();
+ }
+
+ int requested = len;
+ int position = 0;
+
+ while ( requested != 0 )
+ {
+ int nbRead = buffer.limit() - buffer.position();
+ System.arraycopy( buffer.array(), buffer.position(), result, position, nbRead );
+
+ buffer.clear();
+
+ if ( channel != null )
+ {
+ channel.read( buffer );
+ }
+ else
+ {
+ throw new IOException( "Not enough bytes in the buffer" );
+ }
+
+ requested -= nbRead;
+ }
+
+ return result;
+ }
+}
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ByteSerializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ByteSerializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ByteSerializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ByteSerializer.java Thu Aug 2 15:52:30 2012
@@ -20,6 +20,9 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
+
+
/**
* The Byte serializer.
*
@@ -42,8 +45,10 @@ public class ByteSerializer implements E
/**
* {@inheritDoc}
*/
- public Byte deserialize( byte[] in )
+ public Byte deserialize( BufferHandler bufferHandler ) throws IOException
{
+ byte[] in = bufferHandler.read( 1 );
+
return in[0];
}
}
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/CharSerializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/CharSerializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/CharSerializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/CharSerializer.java Thu Aug 2 15:52:30 2012
@@ -20,6 +20,9 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
+
+
/**
* The Character serializer.
*
@@ -45,8 +48,10 @@ public class CharSerializer implements E
/**
* {@inheritDoc}
*/
- public Character deserialize( byte[] in )
+ public Character deserialize( BufferHandler bufferHandler ) throws IOException
{
+ byte[] in = bufferHandler.read( 2 );
+
return Character.valueOf( ( char ) ( ( in[0] << 8 ) +
( in[1] & 0xFF ) ) );
}
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/DefaultSerializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/DefaultSerializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/DefaultSerializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/DefaultSerializer.java Thu Aug 2 15:52:30 2012
@@ -1,6 +1,7 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -65,13 +66,13 @@ public class DefaultSerializer<K, V> imp
/**
* {@inheritDoc}
*/
- public K deserializeKey( byte[] in )
+ public K deserializeKey( BufferHandler bufferHandler ) throws IOException
{
ElementSerializer<K> serializer = ( ElementSerializer<K> ) typeClass.get( keyType );
if ( serializer != null )
{
- K key = serializer.deserialize( in );
+ K key = serializer.deserialize( bufferHandler );
return key;
}
@@ -105,13 +106,13 @@ public class DefaultSerializer<K, V> imp
/**
* {@inheritDoc}
*/
- public V deserializeValue( byte[] in )
+ public V deserializeValue( BufferHandler bufferHandler ) throws IOException
{
ElementSerializer<V> serializer = ( ElementSerializer<V> ) typeClass.get( valueType );
if ( serializer != null )
{
- V value = serializer.deserialize( in );
+ V value = serializer.deserialize( bufferHandler );
return value;
}
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ElementSerializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ElementSerializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ElementSerializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ElementSerializer.java Thu Aug 2 15:52:30 2012
@@ -20,6 +20,9 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
+
+
/**
* This interface is used by implementations elements serializers.
*
@@ -41,8 +44,9 @@ public interface ElementSerializer<T>
/**
* Deserialize an element from a byte[]
*
- * @param in The incoming byte[]
+ * @param in The incoming bufferHandler
* @return The deserialized element
+ * @throws IOException If the deserialization failed
*/
- T deserialize( byte[] in );
+ T deserialize( BufferHandler bufferHandler ) throws IOException;
}
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/IntSerializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/IntSerializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/IntSerializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/IntSerializer.java Thu Aug 2 15:52:30 2012
@@ -20,6 +20,9 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
+
+
/**
* The Integer serializer.
*
@@ -47,8 +50,10 @@ public class IntSerializer implements El
/**
* {@inheritDoc}
*/
- public Integer deserialize( byte[] in )
+ public Integer deserialize( BufferHandler bufferHandler ) throws IOException
{
+ byte[] in = bufferHandler.read( 4 );
+
return ( in[0] << 24 ) +
( ( in[1] & 0xFF ) << 16 ) +
( ( in[2] & 0xFF ) << 8 ) +
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/LongSerializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/LongSerializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/LongSerializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/LongSerializer.java Thu Aug 2 15:52:30 2012
@@ -20,6 +20,9 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
+
+
/**
* The Long serializer.
*
@@ -51,8 +54,10 @@ public class LongSerializer implements E
/**
* {@inheritDoc}
*/
- public Long deserialize( byte[] in )
+ public Long deserialize( BufferHandler bufferHandler ) throws IOException
{
+ byte[] in = bufferHandler.read( 8 );
+
long result = ( ( long ) in[0] << 56 ) +
( ( in[1] & 0xFFL ) << 48 ) +
( ( in[2] & 0xFFL ) << 40 ) +
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/Serializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/Serializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/Serializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/Serializer.java Thu Aug 2 15:52:30 2012
@@ -20,6 +20,9 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
+
+
/**
* This interface is used by implementations of the key and value serializers.
*
@@ -42,10 +45,11 @@ public interface Serializer<K, V>
/**
* Deserialize a key from a byte[]
*
- * @param in The incoming byte[]
+ * @param bufferHandler The incoming BufferHandler
* @return The deserialized key
+ * @throws IOException If the deserialization failed
*/
- K deserializeKey( byte[] in );
+ K deserializeKey( BufferHandler bufferHandler ) throws IOException;
/**
@@ -60,8 +64,9 @@ public interface Serializer<K, V>
/**
* Deserialize a value from a byte[]
*
- * @param in The incoming byte[]
+ * @param bufferHandler The incoming BufferHandler
* @return The deserialized value
+ * @throws IOException If the deserialization failed
*/
- V deserializeValue( byte[] in );
+ V deserializeValue( BufferHandler bufferHandler ) throws IOException;
}
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ShortSerializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ShortSerializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ShortSerializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/ShortSerializer.java Thu Aug 2 15:52:30 2012
@@ -20,6 +20,9 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
+
+
/**
* The Short serializer.
*
@@ -45,8 +48,10 @@ public class ShortSerializer implements
/**
* {@inheritDoc}
*/
- public Short deserialize( byte[] in )
+ public Short deserialize( BufferHandler bufferHandler ) throws IOException
{
+ byte[] in = bufferHandler.read( 2 );
+
return ( short ) ( ( in[0] << 8 ) + ( in[1] & 0xFF ) );
}
}
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/StringSerializer.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/StringSerializer.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/StringSerializer.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/serializer/StringSerializer.java Thu Aug 2 15:52:30 2012
@@ -20,6 +20,7 @@
package org.apache.mavibot.btree.serializer;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -94,8 +95,10 @@ public class StringSerializer implements
/**
* {@inheritDoc}
*/
- public String deserialize( byte[] in )
+ public String deserialize( BufferHandler bufferHandler ) throws IOException
{
+ byte[] in = bufferHandler.read( 4 );
+
int len = ( in[0] << 24 ) +
( ( in[1] & 0xFF ) << 16 ) +
( ( in[2] & 0xFF ) << 8 ) +
@@ -112,6 +115,8 @@ public class StringSerializer implements
default:
try
{
+ in = bufferHandler.read( len );
+
return new String( in, 4, len, "UTF-8" );
}
catch ( UnsupportedEncodingException uee )
Modified: labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/BooleanSerializerTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/BooleanSerializerTest.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/BooleanSerializerTest.java (original)
+++ labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/BooleanSerializerTest.java Thu Aug 2 15:52:30 2012
@@ -22,6 +22,8 @@ package org.apache.mavibot.btree.seriali
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+
import org.junit.Test;
@@ -36,14 +38,14 @@ public class BooleanSerializerTest
@Test
- public void testBooleanSerializer()
+ public void testBooleanSerializer() throws IOException
{
boolean value = true;
byte[] result = serializer.serialize( value );
assertEquals( ( byte ) 0x01, result[0] );
- assertEquals( value, serializer.deserialize( result ).booleanValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).booleanValue() );
// ------------------------------------------------------------------
value = false;
@@ -51,6 +53,6 @@ public class BooleanSerializerTest
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).booleanValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).booleanValue() );
}
}
Modified: labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ByteSerializerTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ByteSerializerTest.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ByteSerializerTest.java (original)
+++ labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ByteSerializerTest.java Thu Aug 2 15:52:30 2012
@@ -22,6 +22,8 @@ package org.apache.mavibot.btree.seriali
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+
import org.junit.Test;
@@ -36,14 +38,14 @@ public class ByteSerializerTest
@Test
- public void testByteSerializer()
+ public void testByteSerializer() throws IOException
{
byte value = 0x00;
byte[] result = serializer.serialize( value );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).byteValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).byteValue() );
// ------------------------------------------------------------------
value = 0x01;
@@ -51,7 +53,7 @@ public class ByteSerializerTest
assertEquals( ( byte ) 0x01, result[0] );
- assertEquals( value, serializer.deserialize( result ).byteValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).byteValue() );
// ------------------------------------------------------------------
value = 0x7F;
@@ -59,7 +61,7 @@ public class ByteSerializerTest
assertEquals( ( byte ) 0x7F, result[0] );
- assertEquals( value, serializer.deserialize( result ).byteValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).byteValue() );
// ------------------------------------------------------------------
value = ( byte ) 0x80;
@@ -67,7 +69,7 @@ public class ByteSerializerTest
assertEquals( ( byte ) 0x80, result[0] );
- assertEquals( value, serializer.deserialize( result ).byteValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).byteValue() );
// ------------------------------------------------------------------
value = ( byte ) 0xFF;
@@ -75,6 +77,6 @@ public class ByteSerializerTest
assertEquals( ( byte ) 0xFF, result[0] );
- assertEquals( value, serializer.deserialize( result ).byteValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).byteValue() );
}
}
Modified: labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/CharSerializerTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/CharSerializerTest.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/CharSerializerTest.java (original)
+++ labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/CharSerializerTest.java Thu Aug 2 15:52:30 2012
@@ -22,6 +22,8 @@ package org.apache.mavibot.btree.seriali
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+
import org.junit.Test;
@@ -36,7 +38,7 @@ public class CharSerializerTest
@Test
- public void testCharSerializer()
+ public void testCharSerializer() throws IOException
{
char value = 0x0000;
byte[] result = serializer.serialize( value );
@@ -44,7 +46,7 @@ public class CharSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).charValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).charValue() );
// ------------------------------------------------------------------
value = 0x0001;
@@ -53,7 +55,7 @@ public class CharSerializerTest
assertEquals( ( byte ) 0x01, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).charValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).charValue() );
// ------------------------------------------------------------------
value = 0x00FF;
@@ -62,7 +64,7 @@ public class CharSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).charValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).charValue() );
// ------------------------------------------------------------------
value = 0x0100;
@@ -71,7 +73,7 @@ public class CharSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x01, result[0] );
- assertEquals( value, serializer.deserialize( result ).charValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).charValue() );
// ------------------------------------------------------------------
value = 0x7FFF;
@@ -80,7 +82,7 @@ public class CharSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x7F, result[0] );
- assertEquals( value, serializer.deserialize( result ).charValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).charValue() );
// ------------------------------------------------------------------
value = 0x8000;
@@ -89,7 +91,7 @@ public class CharSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x80, result[0] );
- assertEquals( value, serializer.deserialize( result ).charValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).charValue() );
// ------------------------------------------------------------------
value = 0xFFFF;
@@ -98,6 +100,6 @@ public class CharSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0xFF, result[0] );
- assertEquals( value, serializer.deserialize( result ).charValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).charValue() );
}
}
Modified: labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/DefaultSerializerTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/DefaultSerializerTest.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/DefaultSerializerTest.java (original)
+++ labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/DefaultSerializerTest.java Thu Aug 2 15:52:30 2012
@@ -22,6 +22,8 @@ package org.apache.mavibot.btree.seriali
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+
import org.junit.Test;
@@ -33,7 +35,7 @@ import org.junit.Test;
public class DefaultSerializerTest
{
@Test
- public void testDefaultSerializerIntegerString()
+ public void testDefaultSerializerIntegerString() throws IOException
{
DefaultSerializer<Integer, String> serializer = new DefaultSerializer<Integer, String>( Integer.class,
String.class );
@@ -56,11 +58,11 @@ public class DefaultSerializerTest
assertEquals( 's', valueBytes[6] );
assertEquals( 't', valueBytes[7] );
- int key = serializer.deserializeKey( keyBytes );
+ int key = serializer.deserializeKey( new BufferHandler( keyBytes ) );
assertEquals( 25, key );
- String value = serializer.deserializeValue( valueBytes );
+ String value = serializer.deserializeValue( new BufferHandler( valueBytes ) );
assertEquals( "test", value );
}
Modified: labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/IntSerializerTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/IntSerializerTest.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/IntSerializerTest.java (original)
+++ labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/IntSerializerTest.java Thu Aug 2 15:52:30 2012
@@ -22,6 +22,8 @@ package org.apache.mavibot.btree.seriali
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+
import org.junit.Test;
@@ -36,7 +38,7 @@ public class IntSerializerTest
@Test
- public void testIntSerializer()
+ public void testIntSerializer() throws IOException
{
int value = 0x00000000;
byte[] result = serializer.serialize( value );
@@ -46,7 +48,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0x00000001;
@@ -57,7 +59,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0x000000FF;
@@ -68,7 +70,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0x00000100;
@@ -79,7 +81,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0x0000FFFF;
@@ -90,7 +92,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0x00010000;
@@ -101,7 +103,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0x01, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0x00FFFFFF;
@@ -112,7 +114,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0x01000000;
@@ -123,7 +125,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x01, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0x7FFFFFFF;
@@ -134,7 +136,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0x00FF, result[1] );
assertEquals( ( byte ) 0x7F, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0x80000000;
@@ -145,7 +147,7 @@ public class IntSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x80, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
// ------------------------------------------------------------------
value = 0xFFFFFFFF;
@@ -156,6 +158,6 @@ public class IntSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0xFF, result[0] );
- assertEquals( value, serializer.deserialize( result ).intValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).intValue() );
}
}
Modified: labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/LongSerializerTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/LongSerializerTest.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/LongSerializerTest.java (original)
+++ labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/LongSerializerTest.java Thu Aug 2 15:52:30 2012
@@ -22,6 +22,8 @@ package org.apache.mavibot.btree.seriali
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+
import org.junit.Test;
@@ -36,7 +38,7 @@ public class LongSerializerTest
@Test
- public void testLongSerializer()
+ public void testLongSerializer() throws IOException
{
long value = 0x0000000000000000L;
byte[] result = serializer.serialize( value );
@@ -50,7 +52,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000000000001L;
@@ -65,7 +67,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x00000000000000FFL;
@@ -80,7 +82,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000000000100L;
@@ -95,7 +97,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x000000000000FFFFL;
@@ -110,7 +112,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000000010000L;
@@ -125,7 +127,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000000FFFFFFL;
@@ -140,7 +142,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000001000000L;
@@ -155,7 +157,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x000000007FFFFFFFL;
@@ -170,7 +172,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000080000000L;
@@ -185,7 +187,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x00000000FFFFFFFFL;
@@ -200,7 +202,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000100000000L;
@@ -215,7 +217,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x000000FFFFFFFFFFL;
@@ -230,7 +232,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000010000000000L;
@@ -245,7 +247,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000FFFFFFFFFFFFL;
@@ -260,7 +262,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0001000000000000L;
@@ -275,7 +277,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x01, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x00FFFFFFFFFFFFFFL;
@@ -290,7 +292,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0100000000000000L;
@@ -305,7 +307,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x01, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x7FFFFFFFFFFFFFFFL;
@@ -320,7 +322,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x7F, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x8000000000000000L;
@@ -335,7 +337,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x80, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0xFFFFFFFFFFFFFFFFL;
@@ -350,6 +352,6 @@ public class LongSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0xFF, result[0] );
- assertEquals( value, serializer.deserialize( result ).longValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
}
}
Modified: labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ShortSerializerTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ShortSerializerTest.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ShortSerializerTest.java (original)
+++ labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/ShortSerializerTest.java Thu Aug 2 15:52:30 2012
@@ -22,6 +22,8 @@ package org.apache.mavibot.btree.seriali
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+
import org.junit.Test;
@@ -36,7 +38,7 @@ public class ShortSerializerTest
@Test
- public void testShortSerializer()
+ public void testShortSerializer() throws IOException
{
short value = 0x0000;
byte[] result = serializer.serialize( value );
@@ -44,7 +46,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).shortValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = 0x0001;
@@ -53,7 +55,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0x01, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).shortValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = 0x00FF;
@@ -62,7 +64,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( result ).shortValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = 0x0100;
@@ -71,7 +73,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x01, result[0] );
- assertEquals( value, serializer.deserialize( result ).shortValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = 0x7FFF;
@@ -80,7 +82,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x7F, result[0] );
- assertEquals( value, serializer.deserialize( result ).shortValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = ( short ) 0x8000;
@@ -89,7 +91,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x80, result[0] );
- assertEquals( value, serializer.deserialize( result ).shortValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = ( short ) 0xFFFF;
@@ -98,6 +100,6 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0xFF, result[0] );
- assertEquals( value, serializer.deserialize( result ).shortValue() );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
}
}
Modified: labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/StringSerializerTest.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/StringSerializerTest.java?rev=1368563&r1=1368562&r2=1368563&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/StringSerializerTest.java (original)
+++ labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/serializer/StringSerializerTest.java Thu Aug 2 15:52:30 2012
@@ -22,6 +22,8 @@ package org.apache.mavibot.btree.seriali
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+
import org.junit.Test;
@@ -36,7 +38,7 @@ public class StringSerializerTest
@Test
- public void testStringSerializer()
+ public void testStringSerializer() throws IOException
{
String value = null;
byte[] result = serializer.serialize( value );
@@ -47,7 +49,7 @@ public class StringSerializerTest
assertEquals( ( byte ) 0xFF, result[2] );
assertEquals( ( byte ) 0xFF, result[3] );
- assertEquals( value, serializer.deserialize( result ) );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ) );
// ------------------------------------------------------------------
value = "";
@@ -59,7 +61,7 @@ public class StringSerializerTest
assertEquals( ( byte ) 0x00, result[2] );
assertEquals( ( byte ) 0x00, result[3] );
- assertEquals( value, serializer.deserialize( result ) );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ) );
// ------------------------------------------------------------------
value = "test";
@@ -75,7 +77,7 @@ public class StringSerializerTest
assertEquals( 's', result[6] );
assertEquals( 't', result[7] );
- assertEquals( value, serializer.deserialize( result ) );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ) );
// ------------------------------------------------------------------
value = "Lécharny";
@@ -96,6 +98,6 @@ public class StringSerializerTest
assertEquals( 'n', result[11] );
assertEquals( 'y', result[12] );
- assertEquals( value, serializer.deserialize( result ) );
+ assertEquals( value, serializer.deserialize( new BufferHandler( result ) ) );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org