From 86504ec4e2a828f005d3d483b74f504514a421ed Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Thu, 7 Jan 2016 14:58:50 +0100 Subject: [PATCH] =str #19377 improve expectNext() error reporting (if no element signaled) --- .../main/scala/akka/stream/testkit/StreamTestKit.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 4bb2dc4e41..d682362c33 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 @@ -251,9 +251,13 @@ object TestSubscriber { /** * Expect and return a stream element. */ - def expectNext(): I = probe.receiveOne(probe.remaining) match { - case OnNext(elem) ⇒ elem.asInstanceOf[I] - case other ⇒ throw new AssertionError("expected OnNext, found " + other) + def expectNext(): I = { + val t = probe.remaining + probe.receiveOne(t) match { + case null ⇒ throw new AssertionError(s"Expected OnNext(_), yet no element signaled during $t") + case OnNext(elem) ⇒ elem.asInstanceOf[I] + case other ⇒ throw new AssertionError("expected OnNext, found " + other) + } } /**