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

Rename Typed TestKit, #25084

Browse source 
Artifact:
akka-testkit-typed -> akka-actor-testkit-typed

Package:
akka.testkit.typed -> akka.actor.testkit.typed

Config:
akka.typed -> akka.actor.typed
akka.testkit.typed -> akka.actor.testkit.typed
This commit is contained in:
Patrik Nordwall 2018-05-15 19:38:43 +02:00
parent 34bb7fee3c
commit b08d3acb4b
112 changed files with 285 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-testkit-typed/src/main/resources/reference.conf → akka-actor-testkit-typed/src/main/resources/reference.conf
View file

@ -1,11 +1,11 @@
############################################
# Akka Typed Testkit Reference Config File #
############################################
##################################################
# Akka Actor Typed Testkit Reference Config File #
##################################################
# This is the reference config file that contains all the default settings.
# Make your edits/overrides in your application.conf.
akka.actor.typed.test {
akka.actor.testkit.typed {
# factor by which to scale timeouts during tests, e.g. to account for shared
# build system load
timefactor = 1.0

20
akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala Normal file
View file

@ -0,0 +1,20 @@
/**
* Copyright (C) 2014-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.actor.testkit.typed
import akka.annotation.DoNotInherit
/**
* All tracked effects for the [[akka.actor.testkit.typed.scaladsl.BehaviorTestKit]] and
* [[akka.actor.testkit.typed.javadsl.BehaviorTestKit]] must extend this type.
*
* Factories/types for effects are available through [[akka.actor.testkit.typed.scaladsl.Effects]]
* and [[akka.actor.testkit.typed.javadsl.Effects]]
*
* Not for user extension
*/
@DoNotInherit
abstract class Effect private[akka] ()

6
akka-testkit-typed/src/main/scala/akka/testkit/typed/FishingOutcome.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/FishingOutcome.scala
View file

@ -2,15 +2,15 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed
package akka.actor.testkit.typed
import akka.annotation.DoNotInherit
/**
* Not for user extension.
*
* Instances are available from `FishingOutcomes` in the respective dsls: [[akka.testkit.typed.scaladsl.FishingOutcomes]]
* and [[akka.testkit.typed.javadsl.FishingOutcomes]]
* Instances are available from `FishingOutcomes` in the respective dsls: [[akka.actor.testkit.typed.scaladsl.FishingOutcomes]]
* and [[akka.actor.testkit.typed.javadsl.FishingOutcomes]]
*/
@DoNotInherit sealed trait FishingOutcome

12
akka-testkit-typed/src/main/scala/akka/testkit/typed/TestKitSettings.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2017-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed
package akka.actor.testkit.typed
import com.typesafe.config.Config
@ -19,27 +19,27 @@ final case class TE(message: String) extends RuntimeException(message) with NoSt
object TestKitSettings {
/**
* Reads configuration settings from `akka.actor.typed.test` section.
* Reads configuration settings from `akka.actor.testkit.typed` section.
*/
def apply(system: ActorSystem[_]): TestKitSettings =
apply(system.settings.config.getConfig("akka.actor.typed.test"))
apply(system.settings.config.getConfig("akka.actor.testkit.typed"))
/**
* Reads configuration settings from given `Config` that
* must have the same layout as the `akka.actor.typed.test` section.
* must have the same layout as the `akka.actor.testkit.typed` section.
*/
def apply(config: Config): TestKitSettings =
new TestKitSettings(config)
/**
* Java API: Reads configuration settings from `akka.actor.typed.test` section.
* Java API: Reads configuration settings from `akka.actor.testkit.typed` section.
*/
def create(system: ActorSystem[_]): TestKitSettings =
apply(system)
/**
* Reads configuration settings from given `Config` that
* must have the same layout as the `akka.actor.typed.test` section.
* must have the same layout as the `akka.actor.testkit.typed` section.
*/
def create(config: Config): TestKitSettings =
new TestKitSettings(config)

2
akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ActorSystemStub.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2016-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.internal
package akka.actor.testkit.typed.internal
import java.util.concurrent.{ CompletionStage, ThreadFactory }

10
akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/BehaviorTestKitImpl.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.internal
package akka.actor.testkit.typed.internal
import java.util
@ -10,8 +10,8 @@ import akka.actor.ActorPath
import akka.actor.typed.{ Behavior, PostStop, Signal, ActorRef }
import akka.annotation.InternalApi
import akka.testkit.typed.Effect
import akka.testkit.typed.scaladsl.Effects._
import akka.actor.testkit.typed.Effect
import akka.actor.testkit.typed.scaladsl.Effects._
import scala.annotation.tailrec
import scala.collection.JavaConverters._
@ -25,8 +25,8 @@ import scala.util.control.NonFatal
*/
@InternalApi
private[akka] final class BehaviorTestKitImpl[T](_path: ActorPath, _initialBehavior: Behavior[T])
extends akka.testkit.typed.javadsl.BehaviorTestKit[T]
with akka.testkit.typed.scaladsl.BehaviorTestKit[T] {
extends akka.actor.testkit.typed.javadsl.BehaviorTestKit[T]
with akka.actor.testkit.typed.scaladsl.BehaviorTestKit[T] {
// really this should be private, make so when we port out tests that need it
private[akka] val ctx = new EffectfulActorContext[T](_path)

2
akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ControlledExecutor.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2016-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.internal
package akka.actor.testkit.typed.internal
import java.util.LinkedList

2
akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/DebugRef.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2016-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.internal
package akka.actor.testkit.typed.internal
import java.util.concurrent.ConcurrentLinkedQueue

6
akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/EffectfulActorContext.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala
View file

@ -2,15 +2,15 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.internal
package akka.actor.testkit.typed.internal
import java.util.concurrent.ConcurrentLinkedQueue
import akka.actor.{ Cancellable, ActorPath }
import akka.actor.typed.{ ActorRef, Behavior, Props }
import akka.annotation.InternalApi
import akka.testkit.typed.Effect
import akka.testkit.typed.scaladsl.Effects._
import akka.actor.testkit.typed.Effect
import akka.actor.testkit.typed.scaladsl.Effects._
import scala.concurrent.duration.{ Duration, FiniteDuration }

4
akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/StubbedActorContext.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala
View file

@ -2,12 +2,12 @@
* Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.internal
package akka.actor.testkit.typed.internal
import akka.actor.typed._
import akka.actor.typed.internal._
import akka.actor.typed.internal.adapter.AbstractLogger
import akka.testkit.typed.scaladsl.TestInbox
import akka.actor.testkit.typed.scaladsl.TestInbox
import akka.actor.{ ActorPath, InvalidMessageException }
import akka.annotation.InternalApi
import akka.event.Logging

6
akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestInboxImpl.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.internal
package akka.actor.testkit.typed.internal
import java.util.concurrent.ConcurrentLinkedQueue
@ -18,8 +18,8 @@ import scala.collection.immutable
*/
@InternalApi
private[akka] final class TestInboxImpl[T](path: ActorPath)
extends akka.testkit.typed.javadsl.TestInbox[T]
with akka.testkit.typed.scaladsl.TestInbox[T] {
extends akka.actor.testkit.typed.javadsl.TestInbox[T]
with akka.actor.testkit.typed.scaladsl.TestInbox[T] {
private val q = new ConcurrentLinkedQueue[T]

2
akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestKitUtils.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.internal
package akka.actor.testkit.typed.internal
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props }

8
akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestProbeImpl.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.internal
package akka.actor.testkit.typed.internal
import java.time
import java.util.concurrent.atomic.AtomicInteger
@ -12,9 +12,9 @@ import java.util.function.Supplier
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Terminated }
import akka.annotation.InternalApi
import akka.testkit.typed.javadsl.{ TestProbe ⇒ JavaTestProbe }
import akka.testkit.typed.scaladsl.{ TestDuration, TestProbe ⇒ ScalaTestProbe }
import akka.testkit.typed.{ FishingOutcome, TestKitSettings }
import akka.actor.testkit.typed.javadsl.{ TestProbe ⇒ JavaTestProbe }
import akka.actor.testkit.typed.scaladsl.{ TestDuration, TestProbe ⇒ ScalaTestProbe }
import akka.actor.testkit.typed.{ FishingOutcome, TestKitSettings }
import akka.util.PrettyDuration._
import akka.util.{ BoxedType, Timeout }
import akka.util.JavaDurationConverters._

14
akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ActorTestKit.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala
View file

@ -2,15 +2,15 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl
package akka.actor.testkit.typed.javadsl
import java.time.Duration
import akka.actor.Scheduler
import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props }
import akka.testkit.typed.TestKitSettings
import akka.testkit.typed.internal.TestKitUtils
import akka.testkit.typed.scaladsl.{ ActorTestKit ⇒ ScalaTestKit }
import akka.actor.testkit.typed.TestKitSettings
import akka.actor.testkit.typed.internal.TestKitUtils
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit ⇒ ScalaTestKit }
import akka.util.Timeout
import com.typesafe.config.Config
import akka.util.JavaDurationConverters._
@ -39,7 +39,7 @@ object ActorTestKit {
/**
* Create a testkit named with this test class, and use a custom config for the actor system,
* and a custom [[akka.testkit.typed.TestKitSettings]]
* and a custom [[akka.actor.testkit.typed.TestKitSettings]]
*/
def create(testClass: Class[_], customConfig: Config, settings: TestKitSettings) = new ActorTestKit(new ScalaTestKit {
override def name = TestKitUtils.testNameFromCallStack(testClass)
@ -97,10 +97,10 @@ object ActorTestKit {
*
* For synchronous testing of a `Behavior` see [[BehaviorTestKit]]
*/
final class ActorTestKit protected (delegate: akka.testkit.typed.scaladsl.ActorTestKit) {
final class ActorTestKit protected (delegate: akka.actor.testkit.typed.scaladsl.ActorTestKit) {
/**
* The default timeout as specified with the config/[[akka.testkit.typed.TestKitSettings]]
* The default timeout as specified with the config/[[akka.actor.testkit.typed.TestKitSettings]]
*/
def timeout: Timeout = delegate.timeout

10
akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/BehaviorTestKit.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala
View file

@ -2,17 +2,17 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl
package akka.actor.testkit.typed.javadsl
import akka.actor.typed.{ Behavior, Signal, ActorRef }
import akka.annotation.DoNotInherit
import akka.testkit.typed.Effect
import akka.testkit.typed.internal.BehaviorTestKitImpl
import akka.actor.testkit.typed.Effect
import akka.actor.testkit.typed.internal.BehaviorTestKitImpl
import java.util.concurrent.ThreadLocalRandom
object BehaviorTestKit {
import akka.testkit.typed.scaladsl.TestInbox.address
import akka.actor.testkit.typed.scaladsl.TestInbox.address
/**
* JAVA API
@ -40,7 +40,7 @@ object BehaviorTestKit {
@DoNotInherit
abstract class BehaviorTestKit[T] {
/**
* Requests the oldest [[Effect]] or [[akka.testkit.typed.javadsl.Effects.noEffects]] if no effects
* Requests the oldest [[Effect]] or [[akka.actor.testkit.typed.javadsl.Effects.noEffects]] if no effects
* have taken place. The effect is consumed, subsequent calls won't
* will not include this effect.
*/

6
akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/Effects.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/Effects.scala
View file

@ -2,12 +2,12 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl
package akka.actor.testkit.typed.javadsl
import java.time.Duration
import akka.actor.typed.{ ActorRef, Behavior, Props }
import akka.testkit.typed.Effect
import akka.actor.testkit.typed.Effect
import akka.util.JavaDurationConverters._
/**
@ -15,7 +15,7 @@ import akka.util.JavaDurationConverters._
* actual effects to expected ones.
*/
object Effects {
import akka.testkit.typed.scaladsl.Effects._
import akka.actor.testkit.typed.scaladsl.Effects._
/**
* The behavior spawned a named child with the given behavior with no specific props

6
akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ManualTime.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl
package akka.actor.testkit.typed.javadsl
import java.time.Duration
import akka.actor.typed.ActorSystem
@ -21,7 +21,7 @@ object ManualTime {
/**
* Config that needs to be in place for the actor system to use the manual
*/
def config(): Config = akka.testkit.typed.scaladsl.ManualTime.config
def config(): Config = akka.actor.testkit.typed.scaladsl.ManualTime.config
/**
* Access the manual scheduler, note that you need to setup the actor system/testkit with [[config()]] for this to
@ -31,7 +31,7 @@ object ManualTime {
system.scheduler match {
case sc: akka.testkit.ExplicitlyTriggeredScheduler ⇒ new ManualTime(sc)
case _ ⇒ throw new IllegalArgumentException("ActorSystem not configured with explicitly triggered scheduler, " +
"make sure to include akka.testkit.typed.javadsl.ManualTime.config() when setting up the test")
"make sure to include akka.actor.testkit.typed.javadsl.ManualTime.config() when setting up the test")
}
}

10
akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestInbox.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala
View file

@ -2,11 +2,11 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl
package akka.actor.testkit.typed.javadsl
import akka.actor.typed.ActorRef
import akka.annotation.DoNotInherit
import akka.testkit.typed.internal.TestInboxImpl
import akka.actor.testkit.typed.internal.TestInboxImpl
import java.util.concurrent.ThreadLocalRandom
@ -14,7 +14,7 @@ import scala.collection.JavaConverters._
import scala.collection.immutable
object TestInbox {
import akka.testkit.typed.scaladsl.TestInbox.address
import akka.actor.testkit.typed.scaladsl.TestInbox.address
def create[T](name: String): TestInbox[T] = {
val uid = ThreadLocalRandom.current().nextInt()
@ -28,9 +28,9 @@ object TestInbox {
/**
* Utility for use as an [[ActorRef]] when *synchronously* testing [[akka.actor.typed.Behavior]]
* with [[akka.testkit.typed.javadsl.BehaviorTestKit]].
* with [[akka.actor.testkit.typed.javadsl.BehaviorTestKit]].
*
* If you plan to use a real [[akka.actor.typed.ActorSystem]] then use [[akka.testkit.typed.javadsl.TestProbe]]
* If you plan to use a real [[akka.actor.typed.ActorSystem]] then use [[akka.actor.testkit.typed.javadsl.TestProbe]]
* for asynchronous testing.
*
* Use `TestInbox.create` factory methods to create instances

2
akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestKitJunitResource.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl
package akka.actor.testkit.typed.javadsl
import akka.actor.Scheduler
import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props }

20
akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestProbe.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala
View file

@ -2,16 +2,16 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl
package akka.actor.testkit.typed.javadsl
import java.time.Duration
import java.util.function.Supplier
import akka.actor.typed.{ ActorRef, ActorSystem }
import akka.annotation.DoNotInherit
import akka.testkit.typed.internal.TestProbeImpl
import akka.testkit.typed.{ FishingOutcome, TestKitSettings }
import akka.testkit.typed.scaladsl.TestDuration
import akka.actor.testkit.typed.internal.TestProbeImpl
import akka.actor.testkit.typed.{ FishingOutcome, TestKitSettings }
import akka.actor.testkit.typed.scaladsl.TestDuration
import akka.util.JavaDurationConverters._
import scala.collection.JavaConverters._
import scala.concurrent.duration.FiniteDuration
@ -27,17 +27,17 @@ object FishingOutcomes {
/**
* Consume this message and continue with the next
*/
def continueAndIgnore(): FishingOutcome = akka.testkit.typed.FishingOutcome.ContinueAndIgnore
def continueAndIgnore(): FishingOutcome = akka.actor.testkit.typed.FishingOutcome.ContinueAndIgnore
/**
* Complete fishing and return this message
*/
def complete(): FishingOutcome = akka.testkit.typed.FishingOutcome.Complete
def complete(): FishingOutcome = akka.actor.testkit.typed.FishingOutcome.Complete
/**
* Fail fishing with a custom error message
*/
def fail(error: String): FishingOutcome = akka.testkit.typed.FishingOutcome.Fail(error)
def fail(error: String): FishingOutcome = akka.actor.testkit.typed.FishingOutcome.Fail(error)
}
object TestProbe {
@ -81,7 +81,7 @@ abstract class TestProbe[M] {
/**
* Obtain time remaining for execution of the innermost enclosing `within`
* block or missing that it returns the properly dilated default for this
* case from settings (key "akka.actor.typed.test.single-expect-default").
* case from settings (key "akka.actor.testkit.typed.single-expect-default").
*/
def getRemainingOrDefault: Duration
@ -105,7 +105,7 @@ abstract class TestProbe[M] {
* the remaining time governed by the innermost enclosing `within` block.
*
* Note that the timeout is scaled using Duration.dilated, which uses the
* configuration entry "akka.actor.typed.test.timefactor", while the min Duration is not.
* configuration entry "akka.actor.testkit.typed.timefactor", while the min Duration is not.
*
* {{{
* val ret = within(50 millis) {
@ -158,7 +158,7 @@ abstract class TestProbe[M] {
def expectNoMessage(max: Duration): Unit
/**
* Assert that no message is received. Waits for the default period configured as `akka.actor.typed.test.expect-no-message-default`
* Assert that no message is received. Waits for the default period configured as `akka.actor.testkit.typed.expect-no-message-default`
* That value is dilated.
*/
def expectNoMessage(): Unit

6
akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/ActorTestKit.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala
View file

@ -2,13 +2,13 @@
* Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.actor.typed.scaladsl.AskPattern._
import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props }
import akka.annotation.{ ApiMayChange, InternalApi }
import akka.testkit.typed.TestKitSettings
import akka.testkit.typed.internal.{ ActorTestKitGuardian, TestKitUtils }
import akka.actor.testkit.typed.TestKitSettings
import akka.actor.testkit.typed.internal.{ ActorTestKitGuardian, TestKitUtils }
import com.typesafe.config.{ Config, ConfigFactory }
import scala.concurrent.Await

10
akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/BehaviorTestKit.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
View file

@ -2,12 +2,12 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.actor.typed.{ Behavior, Signal, ActorRef }
import akka.annotation.DoNotInherit
import akka.testkit.typed.Effect
import akka.testkit.typed.internal.BehaviorTestKitImpl
import akka.actor.testkit.typed.Effect
import akka.actor.testkit.typed.internal.BehaviorTestKitImpl
import java.util.concurrent.ThreadLocalRandom
@ -15,7 +15,7 @@ import scala.collection.immutable
import scala.reflect.ClassTag
object BehaviorTestKit {
import akka.testkit.typed.scaladsl.TestInbox.address
import akka.actor.testkit.typed.scaladsl.TestInbox.address
def apply[T](initialBehavior: Behavior[T], name: String): BehaviorTestKit[T] = {
val uid = ThreadLocalRandom.current().nextInt()
@ -41,7 +41,7 @@ trait BehaviorTestKit[T] {
private[akka] def ctx: akka.actor.typed.ActorContext[T]
/**
* Requests the oldest [[Effect]] or [[akka.testkit.typed.scaladsl.Effects.NoEffects]] if no effects
* Requests the oldest [[Effect]] or [[akka.actor.testkit.typed.scaladsl.Effects.NoEffects]] if no effects
* have taken place. The effect is consumed, subsequent calls won't
* will not include this effect.
*/

4
akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/Effects.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala
View file

@ -2,10 +2,10 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.actor.typed.{ ActorRef, Behavior, Props }
import akka.testkit.typed.Effect
import akka.actor.testkit.typed.Effect
import scala.concurrent.duration.{ Duration, FiniteDuration }

4
akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/ManualTime.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.actor.typed.ActorSystem
import com.typesafe.config.{ Config, ConfigFactory }
@ -30,7 +30,7 @@ object ManualTime {
system.scheduler match {
case sc: akka.testkit.ExplicitlyTriggeredScheduler ⇒ new ManualTime(sc)
case _ ⇒ throw new IllegalArgumentException("ActorSystem not configured with explicitly triggered scheduler, " +
"make sure to include akka.testkit.typed.scaladsl.ManualTime.config() when setting up the test")
"make sure to include akka.actor.testkit.typed.scaladsl.ManualTime.config() when setting up the test")
}
}

8
akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/TestInbox.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala
View file

@ -2,12 +2,12 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.actor.{ Address, RootActorPath }
import akka.actor.typed.ActorRef
import akka.annotation.{ ApiMayChange, DoNotInherit }
import akka.testkit.typed.internal.TestInboxImpl
import akka.actor.testkit.typed.internal.TestInboxImpl
import java.util.concurrent.ThreadLocalRandom
@ -25,9 +25,9 @@ object TestInbox {
/**
* Utility for use as an [[ActorRef]] when *synchronously* testing [[akka.actor.typed.Behavior]]
* with [[akka.testkit.typed.javadsl.BehaviorTestKit]].
* with [[akka.actor.testkit.typed.javadsl.BehaviorTestKit]].
*
* If you plan to use a real [[akka.actor.typed.ActorSystem]] then use [[akka.testkit.typed.javadsl.TestProbe]]
* If you plan to use a real [[akka.actor.typed.ActorSystem]] then use [[akka.actor.testkit.typed.javadsl.TestProbe]]
* for asynchronous testing.
*
* Use factory `apply` in companion to create instances

12
akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/TestProbe.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala
View file

@ -2,12 +2,12 @@
* Copyright (C) 2017-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.actor.typed.{ ActorRef, ActorSystem }
import akka.annotation.DoNotInherit
import akka.testkit.typed.internal.TestProbeImpl
import akka.testkit.typed.{ FishingOutcome, TestKitSettings }
import akka.actor.testkit.typed.internal.TestProbeImpl
import akka.actor.testkit.typed.{ FishingOutcome, TestKitSettings }
import scala.concurrent.duration._
import scala.reflect.ClassTag
@ -61,7 +61,7 @@ object TestProbe {
/**
* Obtain time remaining for execution of the innermost enclosing `within`
* block or missing that it returns the properly dilated default for this
* case from settings (key "akka.actor.typed.test.single-expect-default").
* case from settings (key "akka.actor.testkit.typed.single-expect-default").
*/
def remainingOrDefault: FiniteDuration
@ -85,7 +85,7 @@ object TestProbe {
* the remaining time governed by the innermost enclosing `within` block.
*
* Note that the timeout is scaled using Duration.dilated, which uses the
* configuration entry "akka.actor.typed.test.timefactor", while the min Duration is not.
* configuration entry "akka.actor.testkit.typed.timefactor", while the min Duration is not.
*
* {{{
* val ret = within(50 millis) {
@ -134,7 +134,7 @@ object TestProbe {
def expectNoMessage(max: FiniteDuration): Unit
/**
* Assert that no message is received. Waits for the default period configured as `akka.actor.typed.test.expect-no-message-default`
* Assert that no message is received. Waits for the default period configured as `akka.actor.testkit.typed.expect-no-message-default`
* That value is dilated.
*/
def expectNoMessage(): Unit

4
akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/package.scala → akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed
package akka.actor.testkit.typed
import scala.concurrent.duration.FiniteDuration
@ -15,7 +15,7 @@ package object scaladsl {
*
* {{{
* import scala.concurrent.duration._
* import akka.testkit.typed.scaladsl._
* import akka.actor.testkit.typed.scaladsl._
* 10.milliseconds.dilated
* }}}
*

2
akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/ActorTestKitTest.java → akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl;
package akka.actor.testkit.typed.javadsl;
import akka.Done;
import akka.actor.typed.javadsl.Behaviors;

6
akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/AsyncTestingExampleTest.java → akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java
View file

@ -2,13 +2,13 @@
* Copyright (C) 2017-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl;
package akka.actor.testkit.typed.javadsl;
import akka.actor.typed.ActorRef;
import akka.actor.typed.Behavior;
import akka.actor.typed.javadsl.Behaviors;
import akka.testkit.typed.javadsl.ActorTestKit;
import akka.testkit.typed.javadsl.TestProbe;
import akka.actor.testkit.typed.javadsl.ActorTestKit;
import akka.actor.testkit.typed.javadsl.TestProbe;
import org.junit.AfterClass;
import org.junit.Test;

4
akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/JunitIntegrationExampleTest.java → akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java
View file

@ -2,10 +2,10 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl;
package akka.actor.testkit.typed.javadsl;
// #junit-integration
import akka.testkit.typed.javadsl.TestKitJunitResource;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import org.junit.ClassRule;
import org.junit.Test;

8
akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/ManualTimerExampleTest.java → akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java
View file

@ -2,13 +2,13 @@
* Copyright (C) 2017-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl;
package akka.actor.testkit.typed.javadsl;
//#manual-scheduling-simple
import akka.actor.typed.Behavior;
import akka.testkit.typed.javadsl.ManualTime;
import akka.testkit.typed.javadsl.TestKitJunitResource;
import akka.actor.testkit.typed.javadsl.ManualTime;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import org.junit.ClassRule;
import org.scalatest.junit.JUnitSuite;
import java.time.Duration;
@ -17,7 +17,7 @@ import akka.actor.typed.javadsl.Behaviors;
import org.junit.Test;
import akka.testkit.typed.javadsl.TestProbe;
import akka.actor.testkit.typed.javadsl.TestProbe;
public class ManualTimerExampleTest extends JUnitSuite {

2
akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java → akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl;
package akka.actor.testkit.typed.javadsl;
//#imports
import akka.actor.typed.*;

2
akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/TestProbeTest.java → akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.javadsl;
package akka.actor.testkit.typed.javadsl;
import akka.actor.typed.ActorRef;
import akka.actor.typed.ActorSystem;

4
akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AbstractActorSpec.scala → akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AbstractActorSpec.scala
View file

@ -2,11 +2,11 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
// NOTE: do not optimize import, unused import is here on purpose for docs
//#scalatest-glue
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpec }
abstract class AbstractActorSpec extends WordSpec with ActorTestKit with Matchers with BeforeAndAfterAll {

2
akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/ActorTestKitSpec.scala → akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.actor.typed.Terminated
import akka.actor.typed.scaladsl.Behaviors

2
akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala → akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.actor.typed._
import akka.actor.typed.scaladsl.Behaviors

8
akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/BehaviorTestKitSpec.scala → akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
View file

@ -2,14 +2,14 @@
* Copyright (C) 2014-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.Done
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.{ ActorRef, Behavior, Props }
import akka.testkit.typed.scaladsl.Effects.{ NoEffects, Spawned, SpawnedAdapter, SpawnedAnonymous, SpawnedAnonymousAdapter, Unwatched, Watched }
import akka.testkit.typed.scaladsl.BehaviorTestKitSpec.{ Child, Father }
import akka.testkit.typed.scaladsl.BehaviorTestKitSpec.Father._
import akka.actor.testkit.typed.scaladsl.Effects.{ NoEffects, Spawned, SpawnedAdapter, SpawnedAnonymous, SpawnedAnonymousAdapter, Watched, Unwatched }
import akka.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.{ Child, Father }
import akka.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.Father._
import org.scalatest.{ Matchers, WordSpec }
object BehaviorTestKitSpec {

2
akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/ManualTimerExampleSpec.scala → akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
//#manual-scheduling-simple
import akka.actor.typed.scaladsl.Behaviors

4
akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala → akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala
View file

@ -2,12 +2,12 @@
* Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
//#imports
import akka.actor.typed._
import akka.actor.typed.scaladsl._
import akka.testkit.typed.scaladsl.Effects._
import akka.actor.testkit.typed.scaladsl.Effects._
//#imports
import org.scalatest.{ Matchers, WordSpec }

2
akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/TestProbeSpec.scala → akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.testkit.typed.scaladsl
package akka.actor.testkit.typed.scaladsl
import akka.actor.typed.scaladsl.Behaviors

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java
View file

@ -56,7 +56,7 @@ public class ExtensionsTest extends JUnitSuite {
@Test
public void loadJavaExtensionsFromConfig() {
Config cfg = ConfigFactory.parseString(
"akka.typed.extensions += \"akka.actor.typed.ExtensionsTest$MyExtension\"").resolve();
"akka.actor.typed.extensions += \"akka.actor.typed.ExtensionsTest$MyExtension\"").resolve();
final ActorSystem<Object> system = ActorSystem.create(
Behavior.empty(),
"loadJavaExtensionsFromConfig",

4
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java
View file

@ -7,8 +7,8 @@ package akka.actor.typed.javadsl;
import akka.actor.typed.ActorRef;
import akka.actor.typed.Behavior;
import akka.testkit.AkkaSpec;
import akka.testkit.typed.javadsl.TestKitJunitResource;
import akka.testkit.typed.javadsl.TestProbe;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.util.Timeout;
import org.junit.ClassRule;
import org.junit.Test;

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java
View file

@ -8,7 +8,7 @@ import akka.actor.typed.Behavior;
import akka.event.Logging;
import akka.japi.pf.PFBuilder;
import akka.testkit.CustomEventFilter;
import akka.testkit.typed.javadsl.TestKitJunitResource;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import com.typesafe.config.ConfigFactory;
import org.junit.ClassRule;
import org.junit.Test;

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java
View file

@ -8,7 +8,7 @@ import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
import akka.Done;
import akka.testkit.typed.javadsl.TestKitJunitResource;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import org.junit.ClassRule;
import org.scalatest.junit.JUnitSuite;
import scala.concurrent.duration.Duration;

2
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java
View file

@ -9,7 +9,7 @@ import akka.actor.typed.ActorSystem;
import akka.actor.typed.Behavior;
import akka.actor.typed.Props;
import akka.actor.typed.javadsl.*;
import akka.testkit.typed.javadsl.TestProbe;
import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.util.Timeout;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;

4
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java
View file

@ -12,8 +12,8 @@ import akka.Done;
import akka.actor.typed.ActorRef;
import akka.actor.typed.Behavior;
import akka.actor.typed.javadsl.Behaviors;
import akka.testkit.typed.javadsl.TestInbox;
import akka.testkit.typed.javadsl.BehaviorTestKit;
import akka.actor.testkit.typed.javadsl.TestInbox;
import akka.actor.testkit.typed.javadsl.BehaviorTestKit;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala
View file

@ -6,7 +6,7 @@ package akka.actor.typed
import akka.actor.InvalidMessageException
import akka.actor.typed.scaladsl.Behaviors
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import scala.concurrent.duration._
import scala.reflect.ClassTag

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala
View file

@ -10,7 +10,7 @@ import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.scaladsl.Behaviors._
import akka.actor.typed.scaladsl.adapter._
import akka.testkit.EventFilter
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.util.Timeout
import com.typesafe.config.ConfigFactory
import org.scalatest.concurrent.ScalaFutures

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala
View file

@ -12,7 +12,7 @@ import akka.japi.pf.{ FI, PFBuilder }
import java.util.function.{ Function ⇒ F1 }
import akka.Done
import akka.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox }
import akka.actor.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox }
object BehaviorSpec {
sealed trait Command {

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala
View file

@ -5,8 +5,8 @@
package akka.actor.typed
import akka.actor.typed.scaladsl.Behaviors
import akka.testkit.typed.TestKitSettings
import akka.testkit.typed.scaladsl._
import akka.actor.testkit.typed.TestKitSettings
import akka.actor.testkit.typed.scaladsl._
import scala.util.control.NoStackTrace

14
akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala
View file

@ -53,7 +53,7 @@ object InstanceCountingExtension extends ExtensionId[DummyExtension1] {
object ExtensionsSpec {
val config = ConfigFactory.parseString(
"""
akka.typed {
akka.actor.typed {
library-extensions += "akka.actor.typed.InstanceCountingExtension"
}
""").resolve()
@ -97,7 +97,7 @@ class ExtensionsSpec extends TypedAkkaSpec {
"load extensions from the configuration" in
withEmptyActorSystem("ExtensionsSpec03", Some(ConfigFactory.parseString(
"""
akka.typed.extensions = ["akka.actor.typed.DummyExtension1$", "akka.actor.typed.SlowExtension$"]
akka.actor.typed.extensions = ["akka.actor.typed.DummyExtension1$", "akka.actor.typed.SlowExtension$"]
"""))
) { system ⇒
system.hasExtension(DummyExtension1) should ===(true)
@ -111,7 +111,7 @@ class ExtensionsSpec extends TypedAkkaSpec {
def create(): Unit = {
ActorSystem[Any](Behavior.EmptyBehavior, "ExtensionsSpec04", ConfigFactory.parseString(
"""
akka.typed.extensions = ["akka.actor.typed.FailingToLoadExtension$"]
akka.actor.typed.extensions = ["akka.actor.typed.FailingToLoadExtension$"]
"""))
}
@ -136,7 +136,7 @@ class ExtensionsSpec extends TypedAkkaSpec {
"allow for auto-loading of library-extensions" in
withEmptyActorSystem("ExtensionsSpec06") { system ⇒
val listedExtensions = system.settings.config.getStringList("akka.typed.library-extensions")
val listedExtensions = system.settings.config.getStringList("akka.actor.typed.library-extensions")
listedExtensions.size should be > 0
// could be initalized by other tests, so at least once
InstanceCountingExtension.createCount.get() should be > 0
@ -146,7 +146,7 @@ class ExtensionsSpec extends TypedAkkaSpec {
intercept[RuntimeException] {
withEmptyActorSystem(
"ExtensionsSpec07",
Some(ConfigFactory.parseString("""akka.typed.library-extensions += "akka.actor.typed.FailingToLoadExtension$""""))
Some(ConfigFactory.parseString("""akka.actor.typed.library-extensions += "akka.actor.typed.FailingToLoadExtension$""""))
) { _ ⇒ () }
}
@ -154,7 +154,7 @@ class ExtensionsSpec extends TypedAkkaSpec {
intercept[RuntimeException] {
withEmptyActorSystem(
"ExtensionsSpec08",
Some(ConfigFactory.parseString("""akka.typed.library-extensions += "akka.actor.typed.MissingExtension""""))
Some(ConfigFactory.parseString("""akka.actor.typed.library-extensions += "akka.actor.typed.MissingExtension""""))
) { _ ⇒ () }
}
@ -202,7 +202,7 @@ class ExtensionsSpec extends TypedAkkaSpec {
"override extensions via ActorSystemSetup" in
withEmptyActorSystem("ExtensionsSpec10", Some(ConfigFactory.parseString(
"""
akka.typed.extensions = ["akka.actor.typed.DummyExtension1$", "akka.actor.typed.SlowExtension$"]
akka.actor.typed.extensions = ["akka.actor.typed.DummyExtension1$", "akka.actor.typed.SlowExtension$"]
""")),
Some(ActorSystemSetup(new DummyExtension1Setup(sys ⇒ new DummyExtension1ViaSetup)))
) { system ⇒

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala
View file

@ -7,8 +7,8 @@ package akka.actor.typed
import scala.util.control.NoStackTrace
import akka.actor.typed.scaladsl.Behaviors
import akka.testkit.typed.TestKitSettings
import akka.testkit.typed.scaladsl._
import akka.actor.testkit.typed.TestKitSettings
import akka.actor.testkit.typed.scaladsl._
import org.scalatest.WordSpecLike
object OrElseSpec {

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala
View file

@ -11,8 +11,8 @@ import akka.actor.ActorInitializationException
import akka.actor.typed.scaladsl.{ Behaviors, MutableBehavior }
import akka.actor.typed.scaladsl.Behaviors._
import akka.testkit.EventFilter
import akka.testkit.typed.scaladsl._
import akka.testkit.typed._
import akka.actor.testkit.typed.scaladsl._
import akka.actor.testkit.typed._
import com.typesafe.config.ConfigFactory
import org.scalatest.{ Matchers, WordSpec }

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala
View file

@ -13,7 +13,7 @@ import scala.util.control.NoStackTrace
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.scaladsl.TimerScheduler
import akka.testkit.TimingTest
import akka.testkit.typed.scaladsl.{ ActorTestKit, _ }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, _ }
import org.scalatest.WordSpecLike
class TimerSpec extends ActorTestKit with WordSpecLike with TypedAkkaSpecWithShutdown {

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/TypedAkkaSpec.scala
View file

@ -4,7 +4,7 @@
package akka.actor.typed
import akka.testkit.typed.scaladsl.{ TestInbox, ActorTestKit }
import akka.actor.testkit.typed.scaladsl.{ TestInbox, ActorTestKit }
import org.scalactic.TypeCheckedTripleEquals
import org.scalatest.concurrent.{ Eventually, ScalaFutures }
import org.scalatest.time.Span

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala
View file

@ -9,7 +9,7 @@ import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.scaladsl.MutableBehavior
import akka.actor.typed.scaladsl.adapter._
import akka.testkit.EventFilter
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import scala.concurrent._
import scala.concurrent.duration._

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala
View file

@ -8,7 +8,7 @@ import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.scaladsl.adapter._
import akka.actor.typed.{ ActorRef, TypedAkkaSpecWithShutdown }
import akka.serialization.{ JavaSerializer, SerializationExtension }
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import com.typesafe.config.ConfigFactory
object ActorRefSerializationSpec {

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala
View file

@ -8,7 +8,7 @@ package internal
import akka.Done
import akka.actor.InvalidMessageException
import akka.actor.typed.scaladsl.Behaviors
import akka.testkit.typed.scaladsl.TestInbox
import akka.actor.testkit.typed.scaladsl.TestInbox
import org.scalatest._
import org.scalatest.concurrent.{ Eventually, ScalaFutures }

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala
View file

@ -9,8 +9,8 @@ import akka.actor.typed.receptionist.Receptionist._
import akka.actor.typed.receptionist.{ Receptionist, ServiceKey }
import akka.actor.typed.scaladsl.AskPattern._
import akka.actor.typed.scaladsl.Behaviors
import akka.testkit.typed.TestKitSettings
import akka.testkit.typed.scaladsl.{ ActorTestKit, BehaviorTestKit, TestInbox, TestProbe }
import akka.actor.testkit.typed.TestKitSettings
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, BehaviorTestKit, TestInbox, TestProbe }
import org.scalatest.concurrent.Eventually
import scala.concurrent.Future

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala
View file

@ -9,7 +9,7 @@ import akka.actor.typed.internal.ActorRefSerializationSpec
import akka.actor.typed.receptionist.ServiceKey
import akka.actor.typed.scaladsl.adapter._
import akka.serialization.SerializationExtension
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
class ServiceKeySerializationSpec extends ActorTestKit with TypedAkkaSpecWithShutdown {

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala
View file

@ -7,7 +7,7 @@ package akka.actor.typed.scaladsl
import akka.actor.typed.scaladsl.adapter._
import akka.actor.typed.{ ActorRef, PostStop, Props, TypedAkkaSpecWithShutdown }
import akka.testkit.EventFilter
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import com.typesafe.config.ConfigFactory
import scala.concurrent.TimeoutException

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala
View file

@ -11,7 +11,7 @@ import akka.actor.typed.{ Behavior, LogMarker, TestException, TypedAkkaSpec }
import akka.event.Logging
import akka.event.Logging.{ LogEventWithCause, LogEventWithMarker }
import akka.testkit.EventFilter
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import com.typesafe.config.ConfigFactory
class ActorLoggingSpec extends ActorTestKit with TypedAkkaSpec {

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala
View file

@ -7,7 +7,7 @@ package scaladsl
import akka.Done
import akka.NotUsed
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
final class GracefulStopSpec extends ActorTestKit with TypedAkkaSpecWithShutdown {

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala
View file

@ -11,7 +11,7 @@ import akka.actor.typed.Props
import akka.actor.typed.TestException
import akka.actor.typed.TypedAkkaSpecWithShutdown
import akka.testkit.EventFilter
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import com.typesafe.config.ConfigFactory
object MessageAdapterSpec {

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala
View file

@ -6,7 +6,7 @@ package akka.actor.typed
package scaladsl
import akka.Done
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
final class OnSignalSpec extends ActorTestKit with TypedAkkaSpecWithShutdown {

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala
View file

@ -5,7 +5,7 @@
package akka.actor.typed
package scaladsl
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
class ReceivePartialSpec extends ActorTestKit with TypedAkkaSpecWithShutdown {

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala
View file

@ -5,8 +5,8 @@
package akka.actor.typed.scaladsl
import akka.actor.typed.Behavior
import akka.testkit.typed.internal.StubbedActorContext
import akka.testkit.typed.scaladsl.TestInbox
import akka.actor.testkit.typed.internal.StubbedActorContext
import akka.actor.testkit.typed.scaladsl.TestInbox
import org.scalatest.{ Matchers, WordSpec }
class StashBufferSpec extends WordSpec with Matchers {

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala
View file

@ -5,7 +5,7 @@
package akka.actor.typed
package scaladsl
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
object StashSpec {
sealed trait Command

2
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala
View file

@ -6,7 +6,7 @@ package akka.actor.typed.scaladsl
import akka.Done
import akka.actor.typed.{ PostStop, TypedAkkaSpecWithShutdown }
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import scala.concurrent.Promise

2
akka-actor-typed-tests/src/test/scala/docs/akka/typed/FaultToleranceDocSpec.scala
View file

@ -6,7 +6,7 @@ package docs.akka.typed
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.{ DeathPactException, SupervisorStrategy, TypedAkkaSpecWithShutdown }
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import com.typesafe.config.ConfigFactory
class FaultToleranceDocSpec extends ActorTestKit with TypedAkkaSpecWithShutdown {

2
akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala
View file

@ -7,7 +7,7 @@ package docs.akka.typed
//#imports
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.{ ActorSystem, Logger, PostStop }
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import scala.concurrent.Await
import scala.concurrent.duration._

2
akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala
View file

@ -9,7 +9,7 @@ import java.net.URI
import akka.NotUsed
import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, TypedAkkaSpecWithShutdown }
import akka.actor.typed.scaladsl.{ Behaviors, TimerScheduler }
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.util.Timeout
import scala.concurrent.Future

2
akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala
View file

@ -10,7 +10,7 @@ import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Terminated }
//#imports
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import java.net.URLEncoder
import java.nio.charset.StandardCharsets
import scala.concurrent.Await

2
akka-actor-typed-tests/src/test/scala/docs/akka/typed/MutableIntroSpec.scala
View file

@ -10,7 +10,7 @@ import java.nio.charset.StandardCharsets
import akka.actor.typed._
import akka.actor.typed.scaladsl.{ ActorContext, Behaviors, MutableBehavior }
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import scala.concurrent.duration._
import scala.concurrent.Await

2
akka-actor-typed-tests/src/test/scala/docs/akka/typed/StashDocSpec.scala
View file

@ -11,7 +11,7 @@ import akka.Done
import akka.actor.typed.ActorRef
import akka.actor.typed.Behavior
import akka.actor.typed.scaladsl.Behaviors
import akka.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox }
import akka.actor.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox }
import org.scalatest.Matchers
import org.scalatest.WordSpec

6
akka-actor-typed/src/main/resources/reference.conf
View file

@ -1,6 +1,6 @@
akka.typed {
akka.actor.typed {
# List FQCN of `akka.typed.ExtensionId`s which shall be loaded at actor system startup.
# List FQCN of `akka.actor.typed.ExtensionId`s which shall be loaded at actor system startup.
# Should be on the format: 'extensions = ["com.example.MyExtId1", "com.example.MyExtId2"]' etc.
# See the Akka Documentation for more info about Extensions
extensions = []
@ -13,7 +13,7 @@ akka.typed {
#
# Should not be set by end user applications in 'application.conf', use the extensions property for that
#
library-extensions = ${?akka.typed.library-extensions} []
library-extensions = ${?akka.actor.typed.library-extensions} []
# Receptionist is started eagerly to allow clustered receptionist to gather remote registrations early on.
library-extensions += "akka.actor.typed.receptionist.Receptionist"

6
akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala
View file

@ -46,7 +46,7 @@ trait Extension
* // can be loaded eagerly on system startup through configuration
* // note that the name is the JVM/Java class name, with a dollar sign in the end
* // and not the Scala object name
* akka.typed.extensions = ["com.example.MyExt$"]
* akka.actor.typed.extensions = ["com.example.MyExt$"]
*
* // Allows access like this from Scala
* MyExt().someMethodOnTheExtension()
@ -57,7 +57,7 @@ trait Extension
* *Java API*
*
* To implement an extension in Java you should first create an `ExtensionId` singleton by implementing a static method
* called `getInstance`, this is needed to be able to list the extension among the `akka.typed.extensions` in the configuration
* called `getInstance`, this is needed to be able to list the extension among the `akka.actor.typed.extensions` in the configuration
* and have it loaded when the actor system starts up.
*
* {{{
@ -90,7 +90,7 @@ trait Extension
* }
*
* // can be loaded eagerly on system startup through configuration
* akka.typed.extensions = ["com.example.MyExt"]
* akka.actor.typed.extensions = ["com.example.MyExt"]
*
* // Allows access like this from Scala
* MyExt.someMethodOnTheExtension()

4
akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala
View file

@ -62,8 +62,8 @@ trait ExtensionsImpl extends Extensions { self: ActorSystem[_] ⇒
}
}
loadExtensions("akka.typed.library-extensions", throwOnLoadFail = true)
loadExtensions("akka.typed.extensions", throwOnLoadFail = false)
loadExtensions("akka.actor.typed.library-extensions", throwOnLoadFail = true)
loadExtensions("akka.actor.typed.extensions", throwOnLoadFail = false)
}
final override def hasExtension(ext: ExtensionId[_ <: Extension]): Boolean = findExtension(ext) != null

2
akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala
View file

@ -9,7 +9,7 @@ import akka.cluster.sharding.typed.scaladsl.EntityTypeKey
import akka.cluster.sharding.typed.scaladsl.ClusterSharding
import akka.cluster.typed.{ MultiDcClusterActors, MultiNodeTypedClusterSpec }
import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
import akka.testkit.typed.scaladsl.TestProbe
import akka.actor.testkit.typed.scaladsl.TestProbe
import akka.util.Timeout
import com.typesafe.config.ConfigFactory
import org.scalatest.concurrent.ScalaFutures

2
akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala
View file

@ -8,7 +8,7 @@ import akka.actor.typed.TypedAkkaSpecWithShutdown
import akka.actor.typed.internal.adapter.ActorSystemAdapter
import akka.cluster.sharding.typed.internal.ShardingSerializer
import akka.serialization.SerializationExtension
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
class ShardingSerializerSpec extends ActorTestKit with TypedAkkaSpecWithShutdown {

2
akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
View file

@ -12,7 +12,7 @@ import akka.cluster.sharding.typed.ClusterShardingSettings
import akka.cluster.typed.Cluster
import akka.cluster.typed.Join
import akka.persistence.typed.scaladsl.{ Effect, PersistentBehaviors }
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import com.typesafe.config.ConfigFactory
object ClusterShardingPersistenceSpec {

2
akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala
View file

@ -21,7 +21,7 @@ import akka.cluster.typed.Cluster
import akka.cluster.typed.Join
import akka.cluster.typed.Leave
import akka.serialization.SerializerWithStringManifest
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.util.Timeout
import com.typesafe.config.ConfigFactory
import org.scalatest.time.Span

2
akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala
View file

@ -9,7 +9,7 @@ import akka.actor.typed.scaladsl.adapter._
import akka.cluster.MemberStatus
import akka.remote.testconductor.RoleName
import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
import akka.testkit.typed.scaladsl.TestProbe
import akka.actor.testkit.typed.scaladsl.TestProbe
import com.typesafe.config.ConfigFactory
import scala.concurrent.duration._

2
akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java
View file

@ -6,7 +6,7 @@ package akka.cluster.typed;
import akka.cluster.ClusterEvent;
import akka.actor.typed.ActorSystem;
import akka.testkit.typed.javadsl.TestProbe;
import akka.actor.testkit.typed.javadsl.TestProbe;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import org.junit.Test;

2
akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java
View file

@ -10,7 +10,7 @@ import akka.actor.typed.javadsl.*;
import akka.cluster.ClusterEvent;
import akka.cluster.typed.*;
//#cluster-imports
import akka.testkit.typed.javadsl.TestProbe;
import akka.actor.testkit.typed.javadsl.TestProbe;
import docs.akka.cluster.typed.BasicClusterManualSpec;
// FIXME these tests are awaiting typed Java testkit to be able to await cluster forming like in BasicClusterExampleSpec

4
akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala
View file

@ -12,8 +12,8 @@ import akka.actor.typed.scaladsl.adapter._
import akka.cluster.Cluster
import akka.cluster.ddata.typed.scaladsl.Replicator._
import akka.cluster.ddata.{ GCounter, GCounterKey, ReplicatedData }
import akka.testkit.typed.scaladsl._
import akka.testkit.typed.TestKitSettings
import akka.actor.testkit.typed.scaladsl._
import akka.actor.testkit.typed.TestKitSettings
import akka.util.Timeout
import com.typesafe.config.ConfigFactory
import org.scalatest.concurrent.Eventually

2
akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala
View file

@ -7,7 +7,7 @@ package akka.cluster.typed
import akka.actor.InvalidMessageException
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, PostStop, Terminated }
import akka.testkit.typed.scaladsl.TestInbox
import akka.actor.testkit.typed.scaladsl.TestInbox
import com.typesafe.config.ConfigFactory
import org.scalatest._
import org.scalatest.concurrent.{ Eventually, ScalaFutures }

6
akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala
View file

@ -8,8 +8,8 @@ import akka.actor.typed.TypedAkkaSpecWithShutdown
import akka.actor.typed.scaladsl.adapter._
import akka.cluster.ClusterEvent._
import akka.cluster.MemberStatus
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.testkit.typed.TestKitSettings
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.TestKitSettings
import com.typesafe.config.ConfigFactory
import org.scalatest.concurrent.ScalaFutures
@ -31,7 +31,7 @@ object ClusterApiSpec {
allow-java-serialization = off
}
# generous timeout for cluster forming probes
akka.actor.typed.test.default-timeout = 10s
akka.actor.testkit.typed.default-timeout = 10s
""")
}

4
akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala
View file

@ -9,8 +9,8 @@ import java.nio.charset.StandardCharsets
import akka.actor.ExtendedActorSystem
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.scaladsl.adapter._
import akka.testkit.typed.TestKitSettings
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.TestKitSettings
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.typed.{ ActorRef, ActorRefResolver, Props, TypedAkkaSpecWithShutdown }
import akka.serialization.SerializerWithStringManifest
import com.typesafe.config.ConfigFactory

2
akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala
View file

@ -6,7 +6,7 @@ package akka.cluster.typed
import akka.actor.typed.{ ActorRef, Behavior, Props, TypedAkkaSpecWithShutdown }
import akka.persistence.typed.scaladsl.{ Effect, PersistentBehaviors }
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import com.typesafe.config.ConfigFactory
object ClusterSingletonPersistenceSpec {

2
akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala
View file

@ -12,7 +12,7 @@ import akka.actor.typed.receptionist.{ Receptionist, ServiceKey }
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.{ ActorRef, ActorRefResolver, ActorSystem, TypedAkkaSpecWithShutdown }
import akka.serialization.SerializerWithStringManifest
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.typed.scaladsl.adapter._
import akka.util.Timeout
import com.typesafe.config.ConfigFactory

2
akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala
View file

@ -7,7 +7,7 @@ package akka.cluster.typed
import akka.actor.typed.ActorSystem
import akka.actor.typed.TypedAkkaSpecWithShutdown
import akka.actor.typed.scaladsl.Behaviors
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import com.typesafe.config.ConfigFactory
import scala.concurrent.duration._

2
akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala
View file

@ -9,7 +9,7 @@ import akka.actor.typed.scaladsl.adapter._
import akka.actor.typed.{ Behavior, TypedAkkaSpecWithShutdown }
import akka.cluster.typed.internal.receptionist.ClusterReceptionist
import akka.serialization.SerializationExtension
import akka.testkit.typed.scaladsl.ActorTestKit
import akka.actor.testkit.typed.scaladsl.ActorTestKit
class AkkaClusterTypedSerializerSpec extends ActorTestKit with TypedAkkaSpecWithShutdown {

6
akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala
View file

@ -14,8 +14,8 @@ import akka.actor.typed.{ ActorRef, ActorRefResolver }
import akka.cluster.MemberStatus
import akka.cluster.typed.{ Cluster, Join }
import akka.serialization.SerializerWithStringManifest
import akka.testkit.typed.FishingOutcome
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.FishingOutcome
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import com.typesafe.config.{ Config, ConfigFactory }
import org.scalatest.{ Matchers, WordSpec }
@ -37,8 +37,6 @@ object ClusterReceptionistSpec {
"akka.cluster.typed.internal.receptionist.ClusterReceptionistSpec$$Ping" = test
"akka.cluster.typed.internal.receptionist.ClusterReceptionistSpec$$Pong$$" = test
"akka.cluster.typed.internal.receptionist.ClusterReceptionistSpec$$Perish$$" = test
# for now, using Java serializers is good enough (tm), see #23687
# "akka.typed.internal.receptionist.ReceptionistImpl$$DefaultServiceKey" = test
}
}
akka.remote.artery.enabled = true

2
akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala
View file

@ -14,7 +14,7 @@ import akka.cluster.ClusterEvent._
import akka.cluster.MemberStatus
import akka.cluster.typed._
//#cluster-imports
import akka.testkit.typed.scaladsl.TestProbe
import akka.actor.testkit.typed.scaladsl.TestProbe
import org.scalatest.concurrent.{ Eventually, ScalaFutures }
import org.scalatest.time.{ Millis, Seconds, Span }

2
akka-docs/src/main/paradox/typed/coexisting.md
View file

@ -84,7 +84,7 @@ Java
@scala[That adds some implicit extension methods that are added to untyped and typed `ActorSystem` and `ActorContext` in both directions.]
@java[To convert between typed and untyped there are adapter methods in `akka.typed.javadsl.Adapter`.] Note the inline comments in the example above.
@java[To convert between typed and untyped there are adapter methods in `akka.actor.typed.javadsl.Adapter`.] Note the inline comments in the example above.
## Typed to untyped

77
akka-docs/src/main/paradox/typed/testing.md
View file

@ -6,7 +6,7 @@ To use Akka TestKit Typed, add the module to your project:
@@dependency[sbt,Maven,Gradle] {
group=com.typesafe.akka
artifact=akka-testkit-typed_$scala.binary_version$
artifact=akka-actor-testkit-typed_$scala.binary_version$
version=$akka.version$
scope=test
}
@ -31,6 +31,17 @@ This module is currently marked as @ref:[may change](../common/may-change.md) in
@@@
## Dependency
To use Akka TestKit Typed, add the module to your project:
@@dependency[sbt,Maven,Gradle] {
group=com.typesafe.akka
artifact=akka-actor-testkit-typed_$scala.binary_version$
version=$akka.version$
scope=test
}
## Synchronous behavior testing
The following demonstrates how to test:
@ -43,27 +54,27 @@ The following demonstrates how to test:
The examples below require the following imports:
Scala
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #imports }
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #imports }
Java
: @@snip [SyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java) { #imports }
: @@snip [SyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #imports }
Each of the tests are testing an actor that based on the message executes a different effect to be tested:
Scala
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #under-test }
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #under-test }
Java
: @@snip [SyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java) { #under-test }
: @@snip [SyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #under-test }
For creating a child actor a noop actor is created:
Scala
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #child }
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #child }
Java
: @@snip [SyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java) { #child }
: @@snip [SyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #child }
All of the tests make use of the `BehaviorTestkit` to avoid the need for a real `ActorContext`. Some of the tests
make use of the `TestInbox` which allows the creation of an `ActorRef` that can be used for synchronous testing, similar to the
@ -75,18 +86,18 @@ make use of the `TestInbox` which allows the creation of an `ActorRef` that can
With a name:
Scala
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child }
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child }
Java
: @@snip [SyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child }
: @@snip [SyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child }
Anonymously:
Scala
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-anonymous-child }
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-anonymous-child }
Java
: @@snip [SyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-anonymous-child }
: @@snip [SyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-anonymous-child }
### Sending messages
@ -94,31 +105,31 @@ For testing sending a message a `TestInbox` is created that provides an `ActorRe
messages that have been sent to it.
Scala
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-message }
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-message }
Java
: @@snip [SyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-message }
: @@snip [SyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-message }
Another use case is sending a message to a child actor you can do this by looking up the 'TestInbox' for
a child actor from the 'BehaviorTestKit':
Scala
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child-message }
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child-message }
Java
: @@snip [SyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child-message }
: @@snip [SyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child-message }
For anonymous children the actor names are generated in a deterministic way:
Scala
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child-message-anonymous }
: @@snip [SyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala) { #test-child-message-anonymous }
Java
: @@snip [SyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child-message-anonymous }
: @@snip [SyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java) { #test-child-message-anonymous }
### Testing other effects
The `BehaviorTestkit` keeps track other effects you can verify, look at the sub-classes of `akka.testkit.typed.Effect`
The `BehaviorTestkit` keeps track other effects you can verify, look at the sub-classes of `akka.actor.testkit.typed.Effect`
* SpawnedAdapter
* Stopped
@ -142,10 +153,10 @@ the same in that a single procedure drives the test.
Actor under test:
Scala
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #under-test }
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #under-test }
Java
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #under-test }
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #under-test }
@scala[Tests extend `ActorTestKit`. This provides access to]@java[Tests create an instance of `ActorTestKit`. This provides access to]
@ -154,18 +165,18 @@ Java
* A hook to shut down the ActorSystem from the test suite
Scala
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-header }
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-header }
Java
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-header }
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-header }
Your test is responsible for shutting down the `ActorSystem` e.g. using `BeforeAndAfterAll` when using ScalaTest
Scala
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-shutdown }
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-shutdown }
Java
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-shutdown }
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-shutdown }
The following demonstrates:
@ -174,24 +185,24 @@ The following demonstrates:
* Verifying that the actor under test responds via the `TestProbe`
Scala
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-spawn }
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-spawn }
Java
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-spawn }
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-spawn }
Actors can also be spawned anonymously:
Scala
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-spawn-anonymous }
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala) { #test-spawn-anonymous }
Java
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-spawn-anonymous }
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java) { #test-spawn-anonymous }
### Test framework integration
@@@ div { .group-java }
If you are using JUnit you can use `akka.testkit.typed.javadsl.TestKitJunitResource` to have the async test kit automatically
If you are using JUnit you can use `akka.actor.testkit.typed.javadsl.TestKitJunitResource` to have the async test kit automatically
shutdown when the test is complete.
Note that the dependency on JUnit is marked as optional from the test kit module, so your project must explicitly include
@ -207,10 +218,10 @@ hook it into a ScalaTest test suite.
@@@
Scala
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AbstractActorSpec.scala) { #scalatest-glue }
: @@snip [AsyncTestingExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AbstractActorSpec.scala) { #scalatest-glue }
Java
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/JunitIntegrationExampleTest.java) { #junit-integration }
: @@snip [AsyncTestingExampleTest.java]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java) { #junit-integration }
### Controlling the scheduler
@ -221,7 +232,7 @@ Making such tests more reliable by using generous timeouts make the tests take a
For such situations, we provide a scheduler where you can manually, explicitly advance the clock.
Scala
: @@snip [ManualTimerExampleSpec.scala]($akka$/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/ManualTimerExampleSpec.scala) { #manual-scheduling-simple }
: @@snip [ManualTimerExampleSpec.scala]($akka$/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala) { #manual-scheduling-simple }
Java
: @@snip [ManualTimerExampleTest.scala]($akka$/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/ManualTimerExampleTest.java) { #manual-scheduling-simple }
: @@snip [ManualTimerExampleTest.scala]($akka$/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java) { #manual-scheduling-simple }

2
akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java
View file

@ -6,7 +6,7 @@ package akka.persistence.typed.javadsl;
import akka.actor.Scheduler;
import akka.actor.typed.ActorRef;
import akka.testkit.typed.javadsl.TestInbox;
import akka.actor.testkit.typed.javadsl.TestInbox;
import akka.util.Timeout;
import java.util.*;

4
akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorTest.java
View file

@ -12,8 +12,8 @@ import akka.actor.typed.javadsl.Behaviors;
import akka.japi.Pair;
import akka.japi.function.Function3;
import akka.persistence.typed.scaladsl.PersistentBehaviorSpec;
import akka.testkit.typed.javadsl.TestKitJunitResource;
import akka.testkit.typed.javadsl.TestProbe;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import akka.actor.testkit.typed.javadsl.TestProbe;
import org.junit.ClassRule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;

2
akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala
View file

@ -10,7 +10,7 @@ import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps
import akka.persistence.typed.scaladsl.PersistentBehaviors.CommandHandler
import akka.persistence.typed.scaladsl.{ Effect, PersistentBehavior, PersistentBehaviors }
import akka.testkit.TestLatch
import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import com.typesafe.config.{ Config, ConfigFactory }
import org.scalatest.concurrent.Eventually

Some files were not shown because too many files have changed in this diff Show more