Merge branch 'v07-develop' into v08-remove-value-from-parser

komamitsu · komamitsu · commit 1bc8c85994d5 · 2015-12-27T17:51:11.000+09:00
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala
@@ -258,7 +258,7 @@ class MessagePackerTest
           measureDuration(fileOutput)
         }
       }
-      t("file-output-stream").averageWithoutMinMax shouldBe < (t("byte-array-output-stream").averageWithoutMinMax * 4)
+      t("file-output-stream").averageWithoutMinMax shouldBe < (t("byte-array-output-stream").averageWithoutMinMax * 5)
     }
   }
 
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
@@ -608,8 +608,8 @@ class MessageUnpackerTest extends MessagePackSpec {
         }
       }
 
-      t("reuse-message-buffer").averageWithoutMinMax should be <= t("no-buffer-reset").averageWithoutMinMax
-      // This performance comparition is too close, so we disabled it
+      // This performance comparison is too close, so we disabled it
+      // t("reuse-message-buffer").averageWithoutMinMax should be <= t("no-buffer-reset").averageWithoutMinMax
       // t("reuse-array-input").averageWithoutMinMax should be <= t("no-buffer-reset").averageWithoutMinMax
     }
 

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ class MessagePackerTest`
`258`	`258`	`measureDuration(fileOutput)`
`259`	`259`	`}`
`260`	`260`	`}`
`261`		`- t("file-output-stream").averageWithoutMinMax shouldBe < (t("byte-array-output-stream").averageWithoutMinMax * 4)`
	`261`	`+ t("file-output-stream").averageWithoutMinMax shouldBe < (t("byte-array-output-stream").averageWithoutMinMax * 5)`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
Original file line number	Diff line number	Diff line change
`@@ -608,8 +608,8 @@ class MessageUnpackerTest extends MessagePackSpec {`
`608`	`608`	`}`
`609`	`609`	`}`
`610`	`610`
`611`		`- t("reuse-message-buffer").averageWithoutMinMax should be <= t("no-buffer-reset").averageWithoutMinMax`
`612`		`- // This performance comparition is too close, so we disabled it`
	`611`	`+ // This performance comparison is too close, so we disabled it`
	`612`	`+ // t("reuse-message-buffer").averageWithoutMinMax should be <= t("no-buffer-reset").averageWithoutMinMax`
`613`	`613`	`// t("reuse-array-input").averageWithoutMinMax should be <= t("no-buffer-reset").averageWithoutMinMax`
`614`	`614`	`}`
`615`	`615`