Always display benchmark results

xerial · xerial · commit 1555408fc99d · 2014-05-23T13:57:27.000+09:00
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageFormatTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageFormatTest.scala
@@ -97,7 +97,7 @@ class MessageFormatTest extends MessagePackSpec {
       // Initialize
       MessageFormat.valueOf(0.toByte)
 
-      time("lookup", repeat = 10, logLevel = LogLevel.INFO) {
+      time("lookup", repeat = 10) {
         block("switch") {
           var i = 0
           while(i < N) {
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackSpec.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackSpec.scala
@@ -1,7 +1,7 @@
 package org.msgpack.core
 
 import org.scalatest._
-import xerial.core.log.Logger
+import xerial.core.log.{LogLevel, Logger}
 import xerial.core.util.{TimeReport, Timer}
 import scala.language.implicitConversions
 
@@ -18,6 +18,11 @@ trait Benchmark extends Timer {
 
   val numWarmUpRuns = 10
 
+
+  override protected def time[A](blockName: String, logLevel: LogLevel, repeat: Int)(f: => A): TimeReport = {
+    super.time(blockName, logLevel=LogLevel.INFO, repeat)(f)
+  }
+
   override protected def block[A](name: String, repeat: Int)(f: => A): TimeReport = {
     var i = 0
     while(i < numWarmUpRuns) {
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala
@@ -29,7 +29,7 @@ class MessagePackTest extends MessagePackSpec with PropertyChecks {
       val N = 10000000
       val idx = (0 until N).map(x => Random.nextInt(256).toByte).toArray[Byte]
 
-      time("check fixint", repeat = 100, logLevel = LogLevel.INFO) {
+      time("check fixint", repeat = 100) {
 
         block("mask") {
           var i = 0
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
@@ -174,7 +174,7 @@ class MessageUnpackerTest extends MessagePackSpec {
       val N = 10000
       val data = testData3(N)
 
-      time("skip performance", repeat = 100, logLevel = LogLevel.INFO) {
+      time("skip performance", repeat = 100) {
         block("switch") {
           val unpacker = new MessageUnpacker(data)
           var skipCount = 0
@@ -270,7 +270,7 @@ class MessageUnpackerTest extends MessagePackSpec {
       val data = testData3(10000)
       val N = 100
 
-      val t = time("skip performance", logLevel = LogLevel.INFO, repeat = N) {
+      val t = time("skip performance", repeat = N) {
         block("v6") {
           import org.msgpack.`type`.{ValueType => ValueTypeV6}
           val v6 = new org.msgpack.MessagePack()
@@ -374,7 +374,7 @@ class MessageUnpackerTest extends MessagePackSpec {
 
       val data = testData3(10000)
       val N = 100
-      val t = time("unpack performance", logLevel=LogLevel.INFO, repeat=N) {
+      val t = time("unpack performance", repeat=N) {
         block("v6") {
           val v6 = new org.msgpack.MessagePack()
           val unpacker = new org.msgpack.unpacker.MessagePackUnpacker(v6, new ByteArrayInputStream(data))
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/ValueTypeTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/ValueTypeTest.scala
@@ -77,7 +77,7 @@ class ValueTypeTest extends MessagePackSpec {
         b.result()
       }
 
-      time("lookup", repeat=100, logLevel = LogLevel.INFO) {
+      time("lookup", repeat=100) {
         block("switch") {
           var i = 0
           while(i < N) {
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/buffer/MessageBufferTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/buffer/MessageBufferTest.scala
@@ -54,7 +54,7 @@ class MessageBufferTest extends MessagePackSpec {
 
       val rep = 3
       info(f"Reading buffers (of size:${M}%,d) ${N}%,d x $rep times")
-      time("sequential getInt", repeat = rep, logLevel = LogLevel.INFO) {
+      time("sequential getInt", repeat = rep) {
         block("unsafe array") {
           var i = 0
           while(i < N) {
@@ -88,7 +88,7 @@ class MessageBufferTest extends MessagePackSpec {
         }
       }
 
-      time("random getInt", repeat = rep, logLevel = LogLevel.INFO) {
+      time("random getInt", repeat = rep) {
         block("unsafe array") {
           var i = 0
           while(i < N) {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class ValueTypeTest extends MessagePackSpec {`
`77`	`77`	`b.result()`
`78`	`78`	`}`
`79`	`79`
`80`		`- time("lookup", repeat=100, logLevel = LogLevel.INFO) {`
	`80`	`+ time("lookup", repeat=100) {`
`81`	`81`	`block("switch") {`
`82`	`82`	`var i = 0`
`83`	`83`	`while(i < N) {`