From 9d7621150ff0cd8438a61c511f12dbf9cc71f8ae Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Thu, 9 Nov 2017 09:12:58 +0100 Subject: [PATCH] =stk accept Throwable in stream probe's sendError methods (#23940) --- .../src/main/scala/akka/stream/testkit/StreamTestKit.scala | 4 ++-- build.sbt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala b/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala index 5e28c8c19a..8125b16020 100644 --- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala +++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala @@ -220,7 +220,7 @@ object TestPublisher { this } - def sendError(cause: Exception): Self = { + def sendError(cause: Throwable): Self = { subscription.sendError(cause) this } @@ -795,7 +795,7 @@ private[testkit] object StreamTestKit { def sendNext(element: I): Unit = subscriber.onNext(element) def sendComplete(): Unit = subscriber.onComplete() - def sendError(cause: Exception): Unit = subscriber.onError(cause) + def sendError(cause: Throwable): Unit = subscriber.onError(cause) def sendOnSubscribe(): Unit = subscriber.onSubscribe(this) } diff --git a/build.sbt b/build.sbt index 4a84ef9202..8186bc0558 100644 --- a/build.sbt +++ b/build.sbt @@ -309,6 +309,7 @@ lazy val streamTestkit = akkaModule("akka-stream-testkit") .dependsOn(stream, testkit % "compile->compile;test->test") .settings(Dependencies.streamTestkit) .settings(OSGi.streamTestkit) + .disablePlugins(MimaPlugin) lazy val streamTests = akkaModule("akka-stream-tests") .dependsOn(streamTestkit % "test->test", stream)