From f75f1943a242191b7c007fa690de7b5cff106e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= <self@2m.lt>
Date: Tue, 2 Jul 2019 15:08:28 +0300
Subject: [PATCH] Add expectNoMessage to subscriber probe

---
 .../docs/stream/cookbook/RecipeGlobalRateLimit.scala |  4 ++--
 .../docs/stream/cookbook/RecipeMissedTicks.scala     |  2 +-
 .../docs/stream/cookbook/RecipeSimpleDrop.scala      |  2 +-
 .../scala/akka/stream/testkit/StreamTestKit.scala    | 12 ++++++++++++
 .../scala/akka/stream/scaladsl/FlowAskSpec.scala     |  6 +++---
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeGlobalRateLimit.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeGlobalRateLimit.scala
index cad1f7d561..115c645ab5 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeGlobalRateLimit.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeGlobalRateLimit.scala
@@ -115,11 +115,11 @@ class RecipeGlobalRateLimit extends RecipeSpec {
 
       probe.expectNext() should startWith("E")
       probe.expectNext() should startWith("E")
-      probe.expectNoMsg(500.millis)
+      probe.expectNoMessage()
 
       limiter ! Limiter.ReplenishTokens
       probe.expectNext() should startWith("E")
-      probe.expectNoMsg(500.millis)
+      probe.expectNoMessage()
 
       var resultSet = Set.empty[String]
       for (_ <- 1 to 100) {
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMissedTicks.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMissedTicks.scala
index a03d33d1b8..94ca28b07e 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMissedTicks.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeMissedTicks.scala
@@ -45,7 +45,7 @@ class RecipeMissedTicks extends RecipeSpec {
       sub.expectNext(3)
 
       subscription.request(1)
-      sub.expectNoMsg(100.millis)
+      sub.expectNoMessage()
 
       pub.sendNext(())
       sub.expectNext(0)
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSimpleDrop.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSimpleDrop.scala
index a4b7c79f85..ee35bf58e5 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSimpleDrop.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeSimpleDrop.scala
@@ -33,7 +33,7 @@ class RecipeSimpleDrop extends RecipeSpec {
       messageSource.via(realDroppyStream).to(sink).run()
 
       val subscription = sub.expectSubscription()
-      sub.expectNoMsg(100.millis)
+      sub.expectNoMessage()
 
       pub.sendNext("1")
       pub.sendNext("2")
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 8485aa9704..11b3544d21 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
@@ -625,6 +625,18 @@ object TestSubscriber {
       self
     }
 
+    /**
+     * Fluent DSL
+     *
+     * Assert that no message is received for the specified time.
+     * Waits for the default period configured as `akka.test.expect-no-message-default`.
+     * That timeout is scaled using the configuration entry "akka.test.timefactor".
+     */
+    def expectNoMessage(): Self = {
+      probe.expectNoMessage()
+      self
+    }
+
     /**
      * Java API: Assert that no message is received for the specified time.
      */
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala
index 47199985d9..db5779c6c1 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala
@@ -108,7 +108,7 @@ class FlowAskSpec extends StreamSpec {
       sub.request(2)
       c.expectNext(Reply(1))
       c.expectNext(Reply(2))
-      c.expectNoMessage(200.millis)
+      c.expectNoMessage()
       sub.request(2)
       c.expectNext(Reply(3))
       c.expectComplete()
@@ -120,7 +120,7 @@ class FlowAskSpec extends StreamSpec {
       sub.request(2)
       c.expectNext(Reply(1))
       c.expectNext(Reply(2))
-      c.expectNoMessage(200.millis)
+      c.expectNoMessage()
       sub.request(2)
       c.expectNext(Reply(3))
       c.expectComplete()
@@ -132,7 +132,7 @@ class FlowAskSpec extends StreamSpec {
       sub.request(2)
       c.expectNext(Reply(1))
       c.expectNext(Reply(2))
-      c.expectNoMessage(200.millis)
+      c.expectNoMessage()
       sub.request(2)
       c.expectNext(Reply(3))
       c.expectComplete()