From 51def4163a909bd4677795741f844fc757e1004e Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sun, 19 Oct 2014 22:39:24 +0200 Subject: = core: use explicitly thrown exceptions for failure tests. --- .../instrumentation/akka/ActorSystemMessageInstrumentationSpec.scala | 2 +- .../scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala | 2 +- kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala | 2 +- kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentationSpec.scala index 47867c55..cb39f5e6 100644 --- a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentationSpec.scala +++ b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentationSpec.scala @@ -142,7 +142,7 @@ class ActorSystemMessageInstrumentationSpec extends TestKit(ActorSystem("actor-s class Child extends Actor { def receive = { - case "fail" ⇒ 1 / 0 + case "fail" ⇒ throw new ArithmeticException("Division by zero.") case "context" ⇒ sender ! TraceRecorder.currentContext } diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala index bc864455..5ce90047 100644 --- a/kamon-core/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala +++ b/kamon-core/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala @@ -124,7 +124,7 @@ class TraceTokenReplier(creationTraceContextListener: Option[ActorRef]) extends def receive = { case "fail" ⇒ - 1 / 0 + throw new ArithmeticException("Division by zero.") case "reply-trace-token" ⇒ log.info("Sending back the TT: " + TraceRecorder.currentContext.map(_.token).getOrElse("unavailable")) sender ! currentTraceContextInfo diff --git a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala index 3160719d..9b85a142 100644 --- a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala @@ -193,7 +193,7 @@ class ActorMetricsSpec extends TestKitBase with WordSpecLike with Matchers with class ActorMetricsTestActor extends Actor { def receive = { case Discard ⇒ - case Fail ⇒ 1 / 0 + case Fail ⇒ throw new ArithmeticException("Division by zero.") case Ping ⇒ sender ! Pong case TrackTimings(sendTimestamp, sleep) ⇒ { val dequeueTimestamp = System.nanoTime() diff --git a/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala index a012fba1..ebc43091 100644 --- a/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala @@ -135,7 +135,7 @@ class RouterMetricsSpec extends TestKitBase with WordSpecLike with Matchers with class RouterMetricsTestActor extends Actor { def receive = { case Discard ⇒ - case Fail ⇒ 1 / 0 + case Fail ⇒ throw new ArithmeticException("Division by zero.") case Ping ⇒ sender ! Pong case RouterTrackTimings(sendTimestamp, sleep) ⇒ { val dequeueTimestamp = System.nanoTime() -- cgit v1.2.3