aboutsummaryrefslogtreecommitdiff
path: root/src/test/scala/kamon/instrumentation/RunnableInstrumentationSpec.scala
diff options
context:
space:
mode:
authorIvan Topolnak <ivantopo@gmail.com>2013-06-17 17:32:03 -0300
committerIvan Topolnak <ivantopo@gmail.com>2013-06-17 17:32:03 -0300
commit062894d8429088b154db9cc25c42337956c25a4e (patch)
tree4ac8a0f97d0e0442641712efeaa8ea66a2e769cf /src/test/scala/kamon/instrumentation/RunnableInstrumentationSpec.scala
parent658bdd03a3b549cf7225197388e1e18b01723f1f (diff)
downloadKamon-062894d8429088b154db9cc25c42337956c25a4e.tar.gz
Kamon-062894d8429088b154db9cc25c42337956c25a4e.tar.bz2
Kamon-062894d8429088b154db9cc25c42337956c25a4e.zip
Updated to scalatest 2.0-M6 with scala.concurrent.Future support
Diffstat (limited to 'src/test/scala/kamon/instrumentation/RunnableInstrumentationSpec.scala')
-rw-r--r--src/test/scala/kamon/instrumentation/RunnableInstrumentationSpec.scala15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/test/scala/kamon/instrumentation/RunnableInstrumentationSpec.scala b/src/test/scala/kamon/instrumentation/RunnableInstrumentationSpec.scala
index 359766b6..de65aaca 100644
--- a/src/test/scala/kamon/instrumentation/RunnableInstrumentationSpec.scala
+++ b/src/test/scala/kamon/instrumentation/RunnableInstrumentationSpec.scala
@@ -1,9 +1,8 @@
package kamon.instrumentation
import scala.concurrent.{Await, Promise, Future}
-import org.scalatest.{OptionValues, WordSpec}
-import org.scalatest.matchers.MustMatchers
-import org.scalatest.concurrent.PatienceConfiguration
+import org.scalatest.{Matchers, OptionValues, WordSpec}
+import org.scalatest.concurrent.{ScalaFutures, PatienceConfiguration}
import kamon.{Kamon, TraceContext}
import java.util.UUID
import scala.util.Success
@@ -12,7 +11,7 @@ import java.util.concurrent.TimeUnit
import akka.actor.ActorSystem
-class RunnableInstrumentationSpec extends WordSpec with MustMatchers with ScalaFuturesSupport with PatienceConfiguration with OptionValues {
+class RunnableInstrumentationSpec extends WordSpec with Matchers with ScalaFutures with PatienceConfiguration with OptionValues {
"a instrumented runnable" when {
"created in a thread that does have a TraceContext" must {
@@ -20,7 +19,7 @@ class RunnableInstrumentationSpec extends WordSpec with MustMatchers with ScalaF
"should be available during the run method execution" in { new FutureWithContextFixture {
whenReady(futureWithContext) { result =>
- result.value must be === testContext
+ result.value should equal(testContext)
}
}}
@@ -32,7 +31,7 @@ class RunnableInstrumentationSpec extends WordSpec with MustMatchers with ScalaF
})
whenReady(onCompleteContext.future) { result =>
- result must be === testContext
+ result should equal(testContext)
}
}}
}
@@ -42,7 +41,7 @@ class RunnableInstrumentationSpec extends WordSpec with MustMatchers with ScalaF
"not capture any TraceContext for the body execution" in { new FutureWithoutContextFixture{
whenReady(futureWithoutContext) { result =>
- result must be === None
+ result should equal(None)
}
}}
@@ -54,7 +53,7 @@ class RunnableInstrumentationSpec extends WordSpec with MustMatchers with ScalaF
})
whenReady(onCompleteContext.future) { result =>
- result must be === None
+ result should equal(None)
}
}}
}