raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

#19326 do not call TestKit.remaining for Akka 2.4 compatibility

Browse source
This commit is contained in:
Roland Kuhn 2016-01-12 15:27:14 +01:00 • committed by Konrad Malawski
parent 86504ec4e2
commit 6fa6e39c22
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala
View file

@ -123,7 +123,7 @@ object TestPublisher {
probe.receiveWhile(max, idle, messages)(f.asInstanceOf[PartialFunction[AnyRef, T]])
def expectEventPF[T](f: PartialFunction[PublisherEvent, T]): T =
probe.expectMsgPF[T](probe.remaining)(f.asInstanceOf[PartialFunction[Any, T]])
probe.expectMsgPF[T]()(f.asInstanceOf[PartialFunction[Any, T]])
def getPublisher: Publisher[I] = this
}
@ -252,7 +252,7 @@ object TestSubscriber {
* Expect and return a stream element.
*/
def expectNext(): I = {
val t = probe.remaining
val t = probe.remainingOr(probe.testKitSettings.SingleExpectDefaultTimeout.dilated)
probe.receiveOne(t) match {
case null ⇒ throw new AssertionError(s"Expected OnNext(_), yet no element signaled during $t")
case OnNext(elem) ⇒ elem.asInstanceOf[I]
@ -526,7 +526,7 @@ object TestSubscriber {
}
def expectEventPF[T](f: PartialFunction[SubscriberEvent, T]): T =
probe.expectMsgPF[T](probe.remaining)(f.asInstanceOf[PartialFunction[Any, T]])
probe.expectMsgPF[T]()(f.asInstanceOf[PartialFunction[Any, T]])
/**
* Receive messages for a given duration or until one does not match a given partial function.