fixed Unpacker#skip

frsyuki · frsyuki · commit bb9ed18a44c6 · 2012-03-22T11:11:11.000-07:00
diff --git a/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java b/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java
@@ -571,14 +571,11 @@ public void skip() throws IOException {
         while (true) {
             while (stack.getTopCount() == 0) {
                 stack.pop();
-                if (stack.getTopCount() == 0) {
-                    stack.pop();
-                    if (stack.getDepth() <= targetDepth) {
-                        return;
-                    }
+                if (stack.getDepth() <= targetDepth) {
+                    return;
                 }
             }
-            readOne(valueAccept);
+            readOne(skipAccept);
         }
     }
 
diff --git a/src/main/java/org/msgpack/unpacker/SkipAccept.java b/src/main/java/org/msgpack/unpacker/SkipAccept.java
@@ -17,6 +17,9 @@
 //
 package org.msgpack.unpacker;
 
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
 final class SkipAccept extends Accept {
     @Override
     void acceptBoolean(boolean v) {
@@ -62,6 +65,10 @@ void acceptRaw(byte[] raw) {
     void acceptEmptyRaw() {
     }
 
+    @Override
+    public void refer(ByteBuffer bb, boolean gift) throws IOException {
+    }
+
     @Override
     void acceptArray(int size) {
     }
diff --git a/src/test/java/org/msgpack/unpacker/TestUnpackerSkip.java b/src/test/java/org/msgpack/unpacker/TestUnpackerSkip.java
@@ -0,0 +1,82 @@
+package org.msgpack.unpacker;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+import org.junit.Test;
+import org.msgpack.MessagePack;
+import org.msgpack.packer.BufferPacker;
+import org.msgpack.unpacker.BufferUnpacker;
+import org.msgpack.type.Value;
+import org.msgpack.type.ValueFactory;
+
+public class TestUnpackerSkip {
+    @Test
+    public void testPrimitive() throws Exception {
+        MessagePack msgpack = new MessagePack();
+
+        BufferPacker packer = msgpack.createBufferPacker();
+
+        for(int i=0; i < 10; i++) {
+            packer.write(1);
+            packer.write(i);
+        }
+
+        byte[] bytes = packer.toByteArray();
+        BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
+
+        for(int i=0; i < 10; i++) {
+            unpacker.skip();
+            int n = unpacker.readInt();
+            assertEquals(i, n);
+        }
+    }
+
+    @Test
+    public void testNested() throws Exception {
+        MessagePack msgpack = new MessagePack();
+
+        BufferPacker packer = msgpack.createBufferPacker();
+
+        Value v1 = ValueFactory.createArrayValue(new Value[] {
+            ValueFactory.createRawValue("a"),
+            ValueFactory.createMapValue(new Value[] {
+                ValueFactory.createRawValue("k1"),
+                ValueFactory.createArrayValue(new Value[] { ValueFactory.createIntegerValue(1) })
+            })
+        });
+
+        Value v2 = ValueFactory.createArrayValue(new Value[] {
+            ValueFactory.createMapValue(new Value[] {
+                ValueFactory.createRawValue("k1"),
+                ValueFactory.createArrayValue(new Value[] { ValueFactory.createIntegerValue(1) }),
+                ValueFactory.createRawValue("k2"),
+                ValueFactory.createArrayValue(new Value[] { ValueFactory.createIntegerValue(2) })
+            }),
+            ValueFactory.createMapValue(new Value[] {
+                ValueFactory.createRawValue("k1"),
+                ValueFactory.createArrayValue(new Value[] { ValueFactory.createIntegerValue(1) }),
+                ValueFactory.createRawValue("k2"),
+                ValueFactory.createArrayValue(new Value[] { ValueFactory.createIntegerValue(2) })
+            }),
+            ValueFactory.createRawValue("a")
+        });
+
+        for(int i=0; i < 10; i++) {
+            packer.write(v1);
+            packer.write(v2);
+        }
+
+        byte[] bytes = packer.toByteArray();
+        BufferUnpacker unpacker = msgpack.createBufferUnpacker(bytes);
+
+        for(int i=0; i < 10; i++) {
+            unpacker.skip();
+            Value v2a = unpacker.readValue();
+            assertEquals(v2, v2a);
+        }
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -571,14 +571,11 @@ public void skip() throws IOException {`
`571`	`571`	`while (true) {`
`572`	`572`	`while (stack.getTopCount() == 0) {`
`573`	`573`	`stack.pop();`
`574`		`- if (stack.getTopCount() == 0) {`
`575`		`- stack.pop();`
`576`		`- if (stack.getDepth() <= targetDepth) {`
`577`		`- return;`
`578`		`- }`
	`574`	`+ if (stack.getDepth() <= targetDepth) {`
	`575`	`+ return;`
`579`	`576`	`}`
`580`	`577`	`}`
`581`		`- readOne(valueAccept);`
	`578`	`+ readOne(skipAccept);`
`582`	`579`	`}`
`583`	`580`	`}`
`584`	`581`