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

=str #19128 #19127 rename Source/Sink factory apply overloads

Browse source
This commit is contained in:
Martynas Mickevičius 2015-12-17 11:48:30 +02:00
parent d7b45e0fc3
commit e6e476d82a
146 changed files with 910 additions and 740 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala
View file

@ -13,7 +13,7 @@ class FlowMergeSpec extends BaseTwoStreamsSetup {
override def setup(p1: Publisher[Int], p2: Publisher[Int]) = {
val subscriber = TestSubscriber.probe[Outputs]()
Source(p1).merge(Source(p2)).runWith(Sink(subscriber))
Source.fromPublisher(p1).merge(Source.fromPublisher(p2)).runWith(Sink.fromSubscriber(subscriber))
subscriber
}
@ -27,7 +27,7 @@ class FlowMergeSpec extends BaseTwoStreamsSetup {
val probe = TestSubscriber.manualProbe[Int]()
source1.merge(source2).merge(source3)
.map(_ * 2).map(_ / 2).map(_ + 1).runWith(Sink(probe))
.map(_ * 2).map(_ / 2).map(_ + 1).runWith(Sink.fromSubscriber(probe))
val subscription = probe.expectSubscription()
@ -86,8 +86,8 @@ class FlowMergeSpec extends BaseTwoStreamsSetup {
val up2 = TestPublisher.manualProbe[Int]()
val down = TestSubscriber.manualProbe[Int]()
val (graphSubscriber1, graphSubscriber2) = Source.subscriber[Int]
.mergeMat(Source.subscriber[Int])((_, _)).toMat(Sink(down))(Keep.left).run
val (graphSubscriber1, graphSubscriber2) = Source.asSubscriber[Int]
.mergeMat(Source.asSubscriber[Int])((_, _)).toMat(Sink.fromSubscriber(down))(Keep.left).run
val downstream = down.expectSubscription()
downstream.cancel()