Merge branch 'v07-develop' into v07-add-jackson-dataformat

komamitsu · komamitsu · commit 825e418f2ced · 2014-11-13T00:50:56.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/MapCursorImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/MapCursorImpl.java
@@ -109,7 +109,7 @@ public void accept(ValueVisitor visitor) {
     @Override
     public MapValue toValue() {
         ensureNotTraversed();
-        Value[] keyValueArray = new Value[mapSize];
+        Value[] keyValueArray = new Value[mapSize * 2];
         int i = 0;
         while(hasNext()) {
             keyValueArray[i++] = nextKeyOrValue().toValue();
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala
@@ -1,5 +1,9 @@
 package org.msgpack.core
 
+import org.msgpack.value.Value
+import org.msgpack.value.holder.ValueHolder
+
+import scala.collection.mutable.ListBuffer
 import scala.util.Random
 import MessagePack.Code
 import java.io.ByteArrayOutputStream
@@ -413,5 +417,36 @@ class MessagePackTest extends MessagePackSpec  {
 
     }
 
+    "pack/unpack maps in lists" in {
+      val aMap = List(Map("f" -> "x"))
+
+      check(aMap, { packer =>
+        packer.packArrayHeader(aMap.size)
+        for (m <- aMap) {
+          packer.packMapHeader(m.size)
+          for ((k, v) <- m) {
+            packer.packString(k)
+            packer.packString(v)
+          }
+        }
+      }, { unpacker =>
+        val holder = new ValueHolder()
+        unpacker.unpackValue(holder)
+        val v = holder.get()
+
+        v.asArrayValue().toValueArray.map { m =>
+          val mv = m.asMapValue()
+          val kvs = mv.toKeyValueSeq
+
+          kvs.grouped(2).map({ kvp: Array[Value] =>
+            val k = kvp(0)
+            val v = kvp(1)
+
+            (k.asString().toString, v.asString().toString)
+          }).toMap
+        }.toList
+      })
+    }
+
   }
 }
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/CursorTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/CursorTest.scala
@@ -52,6 +52,24 @@ class CursorTest extends MessagePackSpec {
       }
     }
 
+    "have map cursor" taggedAs("map") in {
+      val packedData = createMessagePackData { packer =>
+        packer packMapHeader(1) packString("f") packString("x")
+      }
+
+      val cursor = mf.newUnpacker(packedData).getCursor
+      val mapCursor = cursor.nextRef().getMapCursor
+      mapCursor.size() shouldBe 1
+
+      val mapValue = mapCursor.toValue
+      val data = mapValue.toKeyValueSeq
+
+      data should have length 2
+
+      data(0).asString().toString shouldBe "f"
+      data(1).asString().toString shouldBe "x"
+    }
+
     "traverse ValueRef faster than traversing Value" taggedAs("ref") in {
       val N = 10000
       val data = binSeq(N)
