Preserve float and double differences

xerial · xerial · commit 770f01368b38 · 2015-06-13T23:41:36.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/value/Variable.java b/msgpack-core/src/main/java/org/msgpack/value/Variable.java
@@ -521,6 +521,13 @@ public Variable setFloatValue(double v) {
         return this;
     }
 
+    public Variable setFloatValue(float v) {
+        this.type = Type.DOUBLE;
+        this.accessor = floatAccessor;
+        this.longValue = (long) v;  // AbstractNumberValueAccessor uses longValue
+        return this;
+    }
+
     private class FloatValueAccessor extends AbstractNumberValueAccessor implements FloatValue {
         @Override
         public FloatValue asFloatValue() {
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala
@@ -128,8 +128,8 @@ class MessagePackerTest extends MessagePackSpec {
       def test(bufferSize: Int, stringSize: Int): Boolean = {
         val msgpack = new MessagePack(new MessagePack.ConfigBuilder().packerBufferSize(bufferSize).build)
         val str = "a" * stringSize
-        val rawString = ValueFactory.newRawString(str.getBytes("UTF-8"))
-        val array = ValueFactory.newArray(rawString)
+        val rawString = ValueFactory.newString(str.getBytes("UTF-8"))
+        val array = ValueFactory.newArrayOf(rawString)
         val out = new ByteArrayOutputStream()
         val packer = msgpack.newPacker(out)
         packer.packValue(array)
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/RawStringValueImplTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/RawStringValueImplTest.scala
@@ -7,7 +7,7 @@ class RawStringValueImplTest extends MessagePackSpec {
   "StringValue" should {
     "return the same hash code if they are equal" in {
       val str = "a"
-      val a1 = ValueFactory.newRawString(str.getBytes("UTF-8"))
+      val a1 = ValueFactory.newString(str.getBytes("UTF-8"))
       val a2 = ValueFactory.newString(str)
 
       a1.shouldEqual(a2)
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/RawValueImplTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/RawValueImplTest.scala
@@ -9,7 +9,7 @@ class RawValueImplTest extends MessagePackSpec {
   "RawValueImple" should {
     "toString shouldn't return empty value" in {
       val str = "aaa"
-      def newRawStr() = ValueFactory.newRawString(str.getBytes("UTF-8"))
+      def newRawStr() = ValueFactory.newString(str.getBytes("UTF-8"))
 
       def pack(v: Value): Array[Byte] = {
         val out = new ByteArrayOutputStream()
@@ -28,7 +28,7 @@ class RawValueImplTest extends MessagePackSpec {
       {
         val rawStr = newRawStr()
         pack(rawStr)
-        rawStr.asString().toString shouldBe str
+        rawStr.asStringValue().toString shouldBe str
       }
     }
   }
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/holder/FloatHolderTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/holder/FloatHolderTest.scala
@@ -1,6 +1,7 @@
 package org.msgpack.value.holder
 
 import org.msgpack.core.MessagePackSpec
+import org.msgpack.value.Variable
 
 /**
  *
@@ -11,13 +12,13 @@ class FloatHolderTest extends MessagePackSpec {
 
     "display value in an appropriate format" in {
 
-      val h = new FloatHolder
+      val h = new Variable
       val f = 0.1341f
-      h.setFloat(f)
+      h.setFloatValue(f)
       h.toString shouldBe java.lang.Float.toString(f)
 
       val d = 0.1341341344
-      h.setDouble(d)
+      h.setFloatValue(d)
       h.toString shouldBe java.lang.Double.toString(d)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class RawValueImplTest extends MessagePackSpec {`
`9`	`9`	`"RawValueImple" should {`
`10`	`10`	`"toString shouldn't return empty value" in {`
`11`	`11`	`val str = "aaa"`
`12`		`- def newRawStr() = ValueFactory.newRawString(str.getBytes("UTF-8"))`
	`12`	`+ def newRawStr() = ValueFactory.newString(str.getBytes("UTF-8"))`
`13`	`13`
`14`	`14`	`def pack(v: Value): Array[Byte] = {`
`15`	`15`	`val out = new ByteArrayOutputStream()`
`@@ -28,7 +28,7 @@ class RawValueImplTest extends MessagePackSpec {`
`28`	`28`	`{`
`29`	`29`	`val rawStr = newRawStr()`
`30`	`30`	`pack(rawStr)`
`31`		`- rawStr.asString().toString shouldBe str`
	`31`	`+ rawStr.asStringValue().toString shouldBe str`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`