From d48c82c2479dbd8de8c53b40a48f3b1e758200f2 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Thu, 29 Nov 2018 12:46:09 +0000
Subject: [PATCH] Fix TestProbeImpl#receiveN_internal with the receiveOne
 change

---
 .../akka/actor/testkit/typed/internal/TestProbeImpl.scala   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala
index 71999ed66c..800d8743bc 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala
@@ -194,8 +194,10 @@ private[akka] final class TestProbeImpl[M](name: String, system: ActorSystem[_])
     for (x ← 1 to n) yield {
       val timeout = stop - now
       val o = receiveOne(timeout)
-      assert(o != null, s"timeout ($max) while expecting $n messages (got ${x - 1})")
-      o
+      o match {
+        case Some(m) ⇒ m
+        case None    ⇒ assertFail(s"timeout ($max) while expecting $n messages (got ${x - 1})")
+      }
     }
   }