added TestLinkedBufferOutput

frsyuki · frsyuki · commit 8010bf4baea7 · 2011-07-04T18:57:14.000+09:00
diff --git a/src/main/java/org/msgpack/io/BufferedOutput.java b/src/main/java/org/msgpack/io/BufferedOutput.java
@@ -27,8 +27,8 @@ public abstract class BufferedOutput implements Output {
     protected ByteBuffer castByteBuffer;
 
     public BufferedOutput(int bufferSize) {
-        if(bufferSize < 8) {
-            bufferSize = 8;
+        if(bufferSize < 9) {
+            bufferSize = 9;
         }
         this.bufferSize = bufferSize;
     }
@@ -49,6 +49,14 @@ private void reserve(int len) throws IOException {
     }
 
     public void write(byte[] b, int off, int len) throws IOException {
+        if(buffer == null) {
+            if(bufferSize < len) {
+                flushBuffer(b, off, len);
+                return;
+            }
+            buffer = new byte[bufferSize];
+            castByteBuffer = ByteBuffer.wrap(buffer);
+        }
         if(buffer.length - filled < len) {
             System.arraycopy(b, off, buffer, filled, len);
             filled += len;
diff --git a/src/main/java/org/msgpack/io/LinkedBufferOutput.java b/src/main/java/org/msgpack/io/LinkedBufferOutput.java
@@ -55,7 +55,7 @@ public byte[] toByteArray() {
     }
 
     public int getSize() {
-        return size;
+        return size + filled;
     }
 
     public void flush() {
diff --git a/src/test/java/org/msgpack/TestCrossLang.java b/src/test/java/org/msgpack/TestCrossLang.java
@@ -1,4 +1,4 @@
-package org.msgpack.util;
+package org.msgpack;
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
diff --git a/src/test/java/org/msgpack/TestSimplePackUnpack.java b/src/test/java/org/msgpack/TestSimplePackUnpack.java
@@ -1,4 +1,4 @@
-package org.msgpack.util;
+package org.msgpack;
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
diff --git a/src/test/java/org/msgpack/io/TestLinkedBufferOutput.java b/src/test/java/org/msgpack/io/TestLinkedBufferOutput.java
@@ -0,0 +1,101 @@
+package org.msgpack.io;
+
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.io.IOException;
+import java.io.DataOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Arrays;
+
+import org.junit.Test;
+import org.msgpack.MessagePack;
+import org.msgpack.value.Value;
+
+import junit.framework.TestCase;
+
+public class TestLinkedBufferOutput extends TestCase {
+    @Test
+    public void testGetSize() throws IOException {
+        LinkedBufferOutput o = new LinkedBufferOutput(10);
+        for(int i=0; i < 21; i++) {
+            o.writeByte((byte)1);
+            assertEquals(i+1, o.getSize());
+        }
+    }
+
+    @Test
+    public void testWritePrimitives() throws IOException {
+        ByteArrayOutputStream bo = new ByteArrayOutputStream();
+        DataOutputStream o1 = new DataOutputStream(bo);
+        LinkedBufferOutput o2 = new LinkedBufferOutput(10);
+        o1.writeByte((byte)2);
+        o2.writeByte((byte)2);
+        o1.writeShort((short)2);
+        o2.writeShort((short)2);
+        o1.writeInt((int)2);
+        o2.writeInt((int)2);
+        o1.writeLong(2L);
+        o2.writeLong(2L);
+        o1.writeFloat(1.1f);
+        o2.writeFloat(1.1f);
+        o1.writeDouble(1.1);
+        o2.writeDouble(1.1);
+        byte[] b1 = bo.toByteArray();
+        byte[] b2 = o2.toByteArray();
+        assertEquals(b1.length, b2.length);
+        assertTrue(Arrays.equals(b1, b2));
+    }
+
+    @Test
+    public void testByteAndWritePrimitives() throws IOException {
+        ByteArrayOutputStream bo = new ByteArrayOutputStream();
+        DataOutputStream o1 = new DataOutputStream(bo);
+        LinkedBufferOutput o2 = new LinkedBufferOutput(10);
+        o1.writeByte((byte)9);
+        o1.writeByte((byte)2);
+        o2.writeByteAndByte((byte)9, (byte)2);
+        o1.writeByte((byte)9);
+        o1.writeShort((short)2);
+        o2.writeByteAndShort((byte)9, (short)2);
+        o1.writeByte((byte)9);
+        o1.writeInt((int)2);
+        o2.writeByteAndInt((byte)9, (int)2);
+        o1.writeByte((byte)9);
+        o1.writeLong(2L);
+        o2.writeByteAndLong((byte)9, 2L);
+        o1.writeByte((byte)9);
+        o1.writeFloat(1.1f);
+        o2.writeByteAndFloat((byte)9, 1.1f);
+        o1.writeByte((byte)9);
+        o1.writeDouble(1.1);
+        o2.writeByteAndDouble((byte)9, 1.1);
+        byte[] b1 = bo.toByteArray();
+        byte[] b2 = o2.toByteArray();
+        assertEquals(b1.length, b2.length);
+        assertTrue(Arrays.equals(b1, b2));
+    }
+
+    @Test
+    public void testWrite() throws IOException {
+        ByteArrayOutputStream bo = new ByteArrayOutputStream();
+        DataOutputStream o1 = new DataOutputStream(bo);
+        LinkedBufferOutput o2 = new LinkedBufferOutput(10);
+        byte[] raw = new byte[9];
+        raw[0] = (byte)1;
+        raw[7] = (byte)1;
+        for(int i=0; i < 11; i++) {
+            o1.write(raw, 0, raw.length);
+            o2.write(raw, 0, raw.length);
+        }
+        byte[] b1 = bo.toByteArray();
+        byte[] b2 = o2.toByteArray();
+        assertEquals(b1.length, b2.length);
+        assertTrue(Arrays.equals(b1, b2));
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public byte[] toByteArray() {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public int getSize() {`
`58`		`- return size;`
	`58`	`+ return size + filled;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public void flush() {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.msgpack.util;`
	`1`	`+package org.msgpack;`
`2`	`2`
`3`	`3`	`import java.math.BigInteger;`
`4`	`4`	`import java.nio.ByteBuffer;`