Update to scala meter 0.7 and scala-uri 0.4.12-SNAPSHOT

Author: theon

build.sbt

@@ -4,17 +4,17 @@ organization  := "com.github.theon"
 
 version       := "0.0.1"
 
-scalaVersion  := "2.10.3"
+scalaVersion  := "2.11.7"
 
 scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8")
 
 resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
 
 libraryDependencies ++= Seq(
-  "com.netaporter" %% "scala-uri" % "0.4.2",
-  "com.github.axel22" %% "scalameter" % "0.4"
+  "com.netaporter" %% "scala-uri" % "0.4.12-SNAPSHOT",
+  "com.storm-enroute" %% "scalameter" % "0.7"
  )
 
 testFrameworks += new TestFramework("org.scalameter.ScalaMeterFramework")
 
-logBuffered := false
+logBuffered := false

src/test/scala/com/netaporter/uri/ParsingBenchmark.scala

@@ -1,34 +1,14 @@
 package com.netaporter.uri
 
-import org.scalameter._
-import org.scalameter.execution.LocalExecutor
+import org.scalameter.api._
 import util.Random
 import com.netaporter.uri.Uri._
-import org.scalameter.reporting.{LoggingReporter, RegressionReporter, HtmlReporter}
-import org.scalameter.Executor.Measurer
-import org.scalameter.persistence.SerializationPersistor
 
 /**
  * Date: 14/04/2013
  * Time: 16:46
  */
-object ParsingBenchmark extends PerformanceTest {
-
-  lazy val executor = LocalExecutor(
-    Executor.Warmer.Default(),
-    Aggregator.complete(Aggregator.average),
-    new Measurer.IgnoringGC
-  )
-
-  lazy val reporter = Reporter.Composite(
-    new RegressionReporter(
-      RegressionReporter.Tester.Accepter(),
-      RegressionReporter.Historian.ExponentialBackoff()
-    ),
-    new LoggingReporter,
-    HtmlReporter(embedDsv = true)
-  )
-  lazy val persistor = new SerializationPersistor
+object ParsingBenchmark extends Bench.OfflineReport {
 
   val lengths = Gen.range("String Length")(1, 2000, 200)
   val testData = lengths.map(i => Random.alphanumeric.take(i).mkString)
@@ -44,7 +24,7 @@ object ParsingBenchmark extends PerformanceTest {
     "http://example.com?" + (1 until data).map(i => s"key$i=val$i").mkString("&")
   )
 
-  performance of "Uri-Parsing" config (api.exec.benchRuns -> 36, api.exec.maxWarmupRuns -> 10) in {
+  performance of "Uri-Parsing" config (exec.benchRuns -> 36, exec.maxWarmupRuns -> 10) in {
 
     measure method "path-length" in {
       using(testLongPaths) in {
@@ -77,3 +57,4 @@ object ParsingBenchmark extends PerformanceTest {
     }
   }
 }
+

src/test/scala/com/netaporter/uri/RenderingBenchmark.scala

@@ -1,51 +1,34 @@
 package com.netaporter.uri
 
-import org.scalameter._
-import org.scalameter.execution.LocalExecutor
-import org.scalameter.Executor.Measurer
-import org.scalameter.reporting.{RegressionReporter, HtmlReporter}
-import util.Random
-import org.scalameter.persistence.SerializationPersistor
+import org.scalameter.Measurer
+import org.scalameter.api._
+
+import scala.util.Random
 
 /**
  * Date: 14/04/2013
  * Time: 18:29
  */
-object RenderingBenchmark extends PerformanceTest {
-
-  lazy val executor = LocalExecutor(
-    Executor.Warmer.Default(),
-    Aggregator.complete(Aggregator.average),
-    new Measurer.IgnoringGC
-  )
-
-  lazy val reporter = Reporter.Composite(
-    new RegressionReporter(
-      RegressionReporter.Tester.Accepter(),
-      RegressionReporter.Historian.ExponentialBackoff()
-    ),
-    HtmlReporter(embedDsv = true)
-  )
-  lazy val persistor = new SerializationPersistor
+object RenderingBenchmark extends Bench.OfflineReport {
 
   val lengths = Gen.range("String Length")(1, 20000, 2000)
   val testData = lengths.map(i => Random.alphanumeric.take(i).mkString)
 
   val testLongPaths = testData.map(data => Uri("/" + data))
   val testLongDomains = testData.map(data => Uri("http", data, ""))
-  val testLongQueryKeys = testData.map(data => Uri(query = QueryString(Vector(data -> "value"))))
-  val testLongQueryValues = testData.map(data => Uri(query = QueryString(Vector("key" -> data))))
+  val testLongQueryKeys = testData.map(data => Uri(query = QueryString(Vector(data -> Some("value")))))
+  val testLongQueryValues = testData.map(data => Uri(query = QueryString(Vector("key" -> Some(data)))))
 
   val numQueryStrings = Gen.range("Num of Query String Pairs")(1, 2000, 200)
 
   val testNumQueryString = numQueryStrings.map(data =>
     Uri(scheme = "http",
       host = "example.com",
-      query = QueryString((1 until data).toVector.map(i => ("key" + i, "val" + i)))
+      query = QueryString((1 until data).toVector.map(i => ("key" + i, Some("val" + i))))
     )
   )
 
-  performance of "Uri-Rendering" config (api.exec.benchRuns -> 36, api.exec.maxWarmupRuns -> 10) in {
+  performance of "Uri-Rendering" config (exec.benchRuns -> 36, exec.maxWarmupRuns -> 10) in {
 
     measure method "path-length" in {
       using(testLongPaths) in {
@@ -77,4 +60,4 @@ object RenderingBenchmark extends PerformanceTest {
       }
     }
   }
-}
+}