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

=str #24298 ActorMaterializer now starts actors under /system unless

Browse source 
inside ActorContext, in which case it still is child actors as usual

This makes sense as they're "internal", so more like system actors
anyway, but the major reason for the change is Akka Typed, in which we
do not control the user guardian, and as such can not attach things
from the side into it
This commit is contained in:
Konrad Malawski 2018-01-22 21:51:49 +09:00 • committed by Patrik Nordwall
parent cbe0215c41
commit dd62071ff8
4 changed files with 65 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorSourceSinkSpec.scala
View file

@ -3,16 +3,16 @@
*/
package akka.stream.typed.scaladsl
import akka.actor.typed.ActorRef
import akka.actor.typed.TypedAkkaSpecWithShutdown
import akka.actor.typed.scaladsl.Behaviors
import akka.stream.OverflowStrategy
import akka.actor.typed.{ ActorRef, ActorSystem }
import akka.testkit.TestKit
import akka.testkit.typed.scaladsl._
import akka.stream.scaladsl.{ Keep, Sink, Source }
import akka.stream.scaladsl.Keep
import akka.stream.scaladsl.Sink
import akka.stream.scaladsl.Source
import akka.stream.typed.ActorMaterializer
import akka.testkit.typed.TestKitSettings
import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike }
import org.scalatest.concurrent.ScalaFutures
import akka.testkit.typed.TestKit
import akka.testkit.typed.scaladsl._
object ActorSourceSinkSpec {
@ -23,22 +23,11 @@ object ActorSourceSinkSpec {
case object Failed extends AckProto
}
class ActorSourceSinkSpec extends TestKit(akka.actor.ActorSystem("ActorSourceSinkSpec")) with WordSpecLike with BeforeAndAfterAll with Matchers with ScalaFutures {
class ActorSourceSinkSpec extends TestKit with TypedAkkaSpecWithShutdown {
import ActorSourceSinkSpec._
import akka.actor.typed.scaladsl.adapter._
// FIXME use Typed Teskit
// The materializer creates a top-level actor when materializing a stream.
// Currently that is not supported, because a Typed Teskit uses a typed actor system
// with a custom guardian. Because of custom guardian, an exception is being thrown
// when trying to create a top level actor during materialization.
implicit val sys = ActorSystem.wrap(system)
implicit val testkitSettings = TestKitSettings(sys)
implicit val mat = ActorMaterializer()
override protected def afterAll(): Unit =
sys.terminate()
"ActorSink" should {
"accept messages" in {
@ -76,7 +65,7 @@ class ActorSourceSinkSpec extends TestKit(akka.actor.ActorSystem("ActorSourceSin
}
}
val pilotRef: ActorRef[AckProto] = system.actorOf(PropsAdapter(autoPilot))
val pilotRef: ActorRef[AckProto] = spawn(autoPilot)
val in =
Source.queue[String](10, OverflowStrategy.dropBuffer)

44
akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/CustomGuardianAndMaterializerSpec.scala Normal file
View file

@ -0,0 +1,44 @@
/*
* Copyright (C) 2017 Lightbend Inc. <http://www.lightbend.com/>
*/
package akka.stream.typed.scaladsl
import scala.concurrent.Future
import akka.actor.typed.ActorRef
import akka.actor.typed.TypedAkkaSpecWithShutdown
import akka.actor.typed.scaladsl.Behaviors
import akka.stream.scaladsl.Sink
import akka.stream.scaladsl.Source
import akka.stream.typed.ActorMaterializer
import akka.testkit.typed.TestKit
object CustomGuardianAndMaterializerSpec {
sealed trait GuardianProtocol
case class Init(sender: ActorRef[String]) extends GuardianProtocol
case class Msg(sender: ActorRef[String], msg: String) extends GuardianProtocol
case object Complete extends GuardianProtocol
case object Failed extends GuardianProtocol
}
class CustomGuardianAndMaterializerSpec extends TestKit with TypedAkkaSpecWithShutdown {
import CustomGuardianAndMaterializerSpec._
val guardian = Behaviors.immutable[GuardianProtocol] {
(_, msg) ⇒ Behaviors.same
}
implicit val mat = ActorMaterializer()
"ActorMaterializer" should {
"work with typed ActorSystem with custom guardian" in {
val it: Future[String] = Source.single("hello").runWith(Sink.head)
it.futureValue should ===("hello")
}
}
}