From b08d3acb4be270a20ad90911203a812fa1889e44 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 15 May 2018 19:38:43 +0200 Subject: [PATCH] Rename Typed TestKit, #25084 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 --- .../src/main/resources/reference.conf | 8 +- .../akka/actor/testkit/typed/Effect.scala | 20 +++++ .../actor}/testkit/typed/FishingOutcome.scala | 6 +- .../testkit/typed/TestKitSettings.scala | 12 +-- .../typed/internal/ActorSystemStub.scala | 2 +- .../typed/internal/BehaviorTestKitImpl.scala | 10 +-- .../typed/internal/ControlledExecutor.scala | 2 +- .../testkit/typed/internal/DebugRef.scala | 2 +- .../internal/EffectfulActorContext.scala | 6 +- .../typed/internal/StubbedActorContext.scala | 4 +- .../typed/internal/TestInboxImpl.scala | 6 +- .../testkit/typed/internal/TestKitUtils.scala | 2 +- .../typed/internal/TestProbeImpl.scala | 8 +- .../testkit/typed/javadsl/ActorTestKit.scala | 14 ++-- .../typed/javadsl/BehaviorTestKit.scala | 10 +-- .../testkit/typed/javadsl/Effects.scala | 6 +- .../testkit/typed/javadsl/ManualTime.scala | 6 +- .../testkit/typed/javadsl/TestInbox.scala | 10 +-- .../typed/javadsl/TestKitJunitResource.scala | 2 +- .../testkit/typed/javadsl/TestProbe.scala | 20 ++--- .../testkit/typed/scaladsl/ActorTestKit.scala | 6 +- .../typed/scaladsl/BehaviorTestKit.scala | 10 +-- .../testkit/typed/scaladsl/Effects.scala | 4 +- .../testkit/typed/scaladsl/ManualTime.scala | 4 +- .../testkit/typed/scaladsl/TestInbox.scala | 8 +- .../testkit/typed/scaladsl/TestProbe.scala | 12 +-- .../testkit/typed/scaladsl/package.scala | 4 +- .../typed/javadsl/ActorTestKitTest.java | 2 +- .../javadsl/AsyncTestingExampleTest.java | 6 +- .../javadsl/JunitIntegrationExampleTest.java | 6 +- .../typed/javadsl/ManualTimerExampleTest.java | 8 +- .../typed/javadsl/SyncTestingExampleTest.java | 2 +- .../testkit/typed/javadsl/TestProbeTest.java | 2 +- .../typed/scaladsl/AbstractActorSpec.scala | 4 +- .../typed/scaladsl/ActorTestKitSpec.scala | 2 +- .../scaladsl/AsyncTestingExampleSpec.scala | 2 +- .../typed/scaladsl/BehaviorTestKitSpec.scala | 8 +- .../scaladsl/ManualTimerExampleSpec.scala | 2 +- .../scaladsl/SyncTestingExampleSpec.scala | 4 +- .../typed/scaladsl/TestProbeSpec.scala | 2 +- .../java/akka/actor/typed/ExtensionsTest.java | 2 +- .../typed/javadsl/ActorContextAskTest.java | 4 +- .../actor/typed/javadsl/ActorLoggingTest.java | 2 +- .../akka/actor/typed/javadsl/WatchTest.java | 2 +- .../akka/typed/InteractionPatternsTest.java | 2 +- .../java/jdocs/akka/typed/StashDocTest.java | 4 +- .../akka/actor/typed/ActorContextSpec.scala | 2 +- .../test/scala/akka/actor/typed/AskSpec.scala | 2 +- .../scala/akka/actor/typed/BehaviorSpec.scala | 2 +- .../scala/akka/actor/typed/DeferredSpec.scala | 4 +- .../akka/actor/typed/ExtensionsSpec.scala | 14 ++-- .../scala/akka/actor/typed/OrElseSpec.scala | 4 +- .../akka/actor/typed/SupervisionSpec.scala | 4 +- .../scala/akka/actor/typed/TimerSpec.scala | 2 +- .../akka/actor/typed/TypedAkkaSpec.scala | 2 +- .../scala/akka/actor/typed/WatchSpec.scala | 2 +- .../internal/ActorRefSerializationSpec.scala | 2 +- .../typed/internal/ActorSystemSpec.scala | 2 +- .../receptionist/LocalReceptionistSpec.scala | 4 +- .../ServiceKeySerializationSpec.scala | 2 +- .../typed/scaladsl/ActorContextAskSpec.scala | 2 +- .../typed/scaladsl/ActorLoggingSpec.scala | 2 +- .../typed/scaladsl/GracefulStopSpec.scala | 2 +- .../typed/scaladsl/MessageAdapterSpec.scala | 2 +- .../actor/typed/scaladsl/OnSignalSpec.scala | 2 +- .../typed/scaladsl/ReceivePartialSpec.scala | 2 +- .../typed/scaladsl/StashBufferSpec.scala | 4 +- .../akka/actor/typed/scaladsl/StashSpec.scala | 2 +- .../akka/actor/typed/scaladsl/StopSpec.scala | 2 +- .../akka/typed/FaultToleranceDocSpec.scala | 2 +- .../docs/akka/typed/GracefulStopDocSpec.scala | 2 +- .../akka/typed/InteractionPatternsSpec.scala | 2 +- .../scala/docs/akka/typed/IntroSpec.scala | 2 +- .../docs/akka/typed/MutableIntroSpec.scala | 2 +- .../scala/docs/akka/typed/StashDocSpec.scala | 2 +- .../src/main/resources/reference.conf | 6 +- .../scala/akka/actor/typed/Extensions.scala | 6 +- .../actor/typed/internal/ExtensionsImpl.scala | 4 +- .../typed/MultiDcClusterShardingSpec.scala | 2 +- .../typed/ShardingSerializerSpec.scala | 2 +- .../ClusterShardingPersistenceSpec.scala | 2 +- .../typed/scaladsl/ClusterShardingSpec.scala | 2 +- .../typed/MultiDcClusterSingletonSpec.scala | 2 +- .../akka/cluster/typed/ClusterApiTest.java | 4 +- .../typed/BasicClusterExampleTest.java | 2 +- .../ddata/typed/scaladsl/ReplicatorSpec.scala | 4 +- .../akka/cluster/typed/ActorSystemSpec.scala | 2 +- .../akka/cluster/typed/ClusterApiSpec.scala | 6 +- .../typed/ClusterSingletonApiSpec.scala | 4 +- .../ClusterSingletonPersistenceSpec.scala | 2 +- .../cluster/typed/RemoteContextAskSpec.scala | 2 +- .../typed/RemoteDeployNotAllowedSpec.scala | 2 +- .../AkkaClusterTypedSerializerSpec.scala | 2 +- .../ClusterReceptionistSpec.scala | 6 +- .../typed/BasicClusterExampleSpec.scala | 2 +- .../src/main/paradox/typed/coexisting.md | 2 +- akka-docs/src/main/paradox/typed/testing.md | 77 +++++++++++-------- .../PersistentActorCompileOnlyTest.java | 2 +- .../typed/javadsl/PersistentActorTest.java | 4 +- .../typed/ManyRecoveriesSpec.scala | 2 +- ...tsourcedStashReferenceManagementTest.scala | 2 +- .../internal/RecoveryPermitterSpec.scala | 2 +- .../scaladsl/OptionalSnapshotStoreSpec.scala | 2 +- .../typed/scaladsl/PerformanceSpec.scala | 4 +- .../scaladsl/PersistentBehaviorSpec.scala | 4 +- .../stream/typed/scaladsl/ActorFlowSpec.scala | 2 +- .../typed/scaladsl/ActorSourceSinkSpec.scala | 2 +- .../CustomGuardianAndMaterializerSpec.scala | 2 +- .../akka/testkit/typed/BehaviorTestkit.scala | 0 .../scala/akka/testkit/typed/Effect.scala | 20 ----- build.sbt | 18 ++--- project/Dependencies.scala | 2 +- 112 files changed, 285 insertions(+), 276 deletions(-) rename {akka-testkit-typed => akka-actor-testkit-typed}/src/main/resources/reference.conf (84%) create mode 100644 akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/FishingOutcome.scala (76%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/TestKitSettings.scala (84%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/internal/ActorSystemStub.scala (98%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/internal/BehaviorTestKitImpl.scala (94%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/internal/ControlledExecutor.scala (93%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/internal/DebugRef.scala (97%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/internal/EffectfulActorContext.scala (94%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/internal/StubbedActorContext.scala (99%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/internal/TestInboxImpl.scala (90%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/internal/TestKitUtils.scala (98%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/internal/TestProbeImpl.scala (97%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/javadsl/ActorTestKit.scala (92%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/javadsl/BehaviorTestKit.scala (91%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/javadsl/Effects.scala (96%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/javadsl/ManualTime.scala (88%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/javadsl/TestInbox.scala (84%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/javadsl/TestKitJunitResource.scala (98%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/javadsl/TestProbe.scala (91%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/scaladsl/ActorTestKit.scala (96%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/scaladsl/BehaviorTestKit.scala (91%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/scaladsl/Effects.scala (98%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/scaladsl/ManualTime.scala (92%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/scaladsl/TestInbox.scala (86%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/scaladsl/TestProbe.scala (94%) rename {akka-testkit-typed/src/main/scala/akka => akka-actor-testkit-typed/src/main/scala/akka/actor}/testkit/typed/scaladsl/package.scala (89%) rename {akka-testkit-typed/src/test/java/akka => akka-actor-testkit-typed/src/test/java/akka/actor}/testkit/typed/javadsl/ActorTestKitTest.java (96%) rename {akka-testkit-typed/src/test/java/akka => akka-actor-testkit-typed/src/test/java/akka/actor}/testkit/typed/javadsl/AsyncTestingExampleTest.java (91%) rename {akka-testkit-typed/src/test/java/akka => akka-actor-testkit-typed/src/test/java/akka/actor}/testkit/typed/javadsl/JunitIntegrationExampleTest.java (77%) rename {akka-testkit-typed/src/test/java/akka => akka-actor-testkit-typed/src/test/java/akka/actor}/testkit/typed/javadsl/ManualTimerExampleTest.java (86%) rename {akka-testkit-typed/src/test/java/akka => akka-actor-testkit-typed/src/test/java/akka/actor}/testkit/typed/javadsl/SyncTestingExampleTest.java (98%) rename {akka-testkit-typed/src/test/java/akka => akka-actor-testkit-typed/src/test/java/akka/actor}/testkit/typed/javadsl/TestProbeTest.java (97%) rename {akka-testkit-typed/src/test/scala/akka => akka-actor-testkit-typed/src/test/scala/akka/actor}/testkit/typed/scaladsl/AbstractActorSpec.scala (81%) rename {akka-testkit-typed/src/test/scala/akka => akka-actor-testkit-typed/src/test/scala/akka/actor}/testkit/typed/scaladsl/ActorTestKitSpec.scala (97%) rename {akka-testkit-typed/src/test/scala/akka => akka-actor-testkit-typed/src/test/scala/akka/actor}/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala (96%) rename {akka-testkit-typed/src/test/scala/akka => akka-actor-testkit-typed/src/test/scala/akka/actor}/testkit/typed/scaladsl/BehaviorTestKitSpec.scala (96%) rename {akka-testkit-typed/src/test/scala/akka => akka-actor-testkit-typed/src/test/scala/akka/actor}/testkit/typed/scaladsl/ManualTimerExampleSpec.scala (98%) rename {akka-testkit-typed/src/test/scala/akka => akka-actor-testkit-typed/src/test/scala/akka/actor}/testkit/typed/scaladsl/SyncTestingExampleSpec.scala (96%) rename {akka-testkit-typed/src/test/scala/akka => akka-actor-testkit-typed/src/test/scala/akka/actor}/testkit/typed/scaladsl/TestProbeSpec.scala (98%) delete mode 100644 akka-testkit-typed/src/main/scala/akka/testkit/typed/BehaviorTestkit.scala delete mode 100644 akka-testkit-typed/src/main/scala/akka/testkit/typed/Effect.scala diff --git a/akka-testkit-typed/src/main/resources/reference.conf b/akka-actor-testkit-typed/src/main/resources/reference.conf similarity index 84% rename from akka-testkit-typed/src/main/resources/reference.conf rename to akka-actor-testkit-typed/src/main/resources/reference.conf index ba2f0360e4..c0e2ca1742 100644 --- a/akka-testkit-typed/src/main/resources/reference.conf +++ b/akka-actor-testkit-typed/src/main/resources/reference.conf @@ -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 diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala new file mode 100644 index 0000000000..e19ab3946c --- /dev/null +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala @@ -0,0 +1,20 @@ +/** + * Copyright (C) 2014-2018 Lightbend Inc. + */ + +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] () + diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/FishingOutcome.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/FishingOutcome.scala similarity index 76% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/FishingOutcome.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/FishingOutcome.scala index 116bd3a8af..f7933c69b5 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/FishingOutcome.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/FishingOutcome.scala @@ -2,15 +2,15 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/TestKitSettings.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala similarity index 84% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/TestKitSettings.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala index a1026cbabe..62bb15cb97 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/TestKitSettings.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala @@ -2,7 +2,7 @@ * Copyright (C) 2017-2018 Lightbend Inc. */ -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) diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ActorSystemStub.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala similarity index 98% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ActorSystemStub.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala index 81fab13b7d..1770dce6f7 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ActorSystemStub.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2018 Lightbend Inc. */ -package akka.testkit.typed.internal +package akka.actor.testkit.typed.internal import java.util.concurrent.{ CompletionStage, ThreadFactory } diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/BehaviorTestKitImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala similarity index 94% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/BehaviorTestKitImpl.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala index e04a652e2c..78657d7967 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/BehaviorTestKitImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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) diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ControlledExecutor.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala similarity index 93% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ControlledExecutor.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala index 04b2265d05..1e7c5bc6c7 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ControlledExecutor.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2018 Lightbend Inc. */ -package akka.testkit.typed.internal +package akka.actor.testkit.typed.internal import java.util.LinkedList diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/DebugRef.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala similarity index 97% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/DebugRef.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala index 8c44fc185b..e6d7a0fd1b 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/DebugRef.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala @@ -2,7 +2,7 @@ * Copyright (C) 2016-2018 Lightbend Inc. */ -package akka.testkit.typed.internal +package akka.actor.testkit.typed.internal import java.util.concurrent.ConcurrentLinkedQueue diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/EffectfulActorContext.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala similarity index 94% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/EffectfulActorContext.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala index 5c2f2d56eb..afba39a8dc 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/EffectfulActorContext.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala @@ -2,15 +2,15 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 } diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/StubbedActorContext.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala similarity index 99% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/StubbedActorContext.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala index 486340a3cd..a43c1afc06 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/StubbedActorContext.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala @@ -2,12 +2,12 @@ * Copyright (C) 2018 Lightbend Inc. */ -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 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestInboxImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala similarity index 90% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestInboxImpl.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala index 71270a6cc6..c185cdf6bb 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestInboxImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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] diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestKitUtils.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala similarity index 98% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestKitUtils.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala index 906af6b3ca..335ebae056 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestKitUtils.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 } diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestProbeImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala similarity index 97% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestProbeImpl.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala index 7e9813c2af..8669904d43 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestProbeImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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._ diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala similarity index 92% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ActorTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala index 8f990e0d87..229d2ae45c 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ActorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala @@ -2,15 +2,15 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/BehaviorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala similarity index 91% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/BehaviorTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala index 64d4709d1e..0c1e2eae15 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/BehaviorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala @@ -2,17 +2,17 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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. */ diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/Effects.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/Effects.scala similarity index 96% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/Effects.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/Effects.scala index 477c2c447f..f24fdb3bd8 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/Effects.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/Effects.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ManualTime.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala similarity index 88% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ManualTime.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala index 31144e2ee5..fa36fcc570 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ManualTime.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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") } } diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestInbox.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala similarity index 84% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestInbox.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala index b13cfc60d9..c26dcb4b2e 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestInbox.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestKitJunitResource.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala similarity index 98% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestKitJunitResource.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala index 31c57434a9..99a6b225c7 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestKitJunitResource.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -package akka.testkit.typed.javadsl +package akka.actor.testkit.typed.javadsl import akka.actor.Scheduler import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props } diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestProbe.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala similarity index 91% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestProbe.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala index c61c02cdc3..0781f0f94a 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/TestProbe.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala @@ -2,16 +2,16 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/ActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala similarity index 96% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/ActorTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala index d26dfc34af..412f580904 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/ActorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala @@ -2,13 +2,13 @@ * Copyright (C) 2018 Lightbend Inc. */ -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 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/BehaviorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala similarity index 91% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/BehaviorTestKit.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala index 2eefb07ca7..2340715b48 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/BehaviorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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. */ diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/Effects.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala similarity index 98% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/Effects.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala index 954aaddf23..841c9e12b0 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/Effects.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala @@ -2,10 +2,10 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 } diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/ManualTime.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala similarity index 92% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/ManualTime.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala index 92521df941..ef1486f735 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/ManualTime.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018 Lightbend Inc. */ -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") } } diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/TestInbox.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala similarity index 86% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/TestInbox.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala index 04bfe2f0f8..f32601f626 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/TestInbox.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala @@ -2,12 +2,12 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/TestProbe.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala similarity index 94% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/TestProbe.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala index a567b2fcf1..97017871be 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/TestProbe.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala @@ -2,12 +2,12 @@ * Copyright (C) 2017-2018 Lightbend Inc. */ -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 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/package.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala similarity index 89% rename from akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/package.scala rename to akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala index fcbe8c9886..500186ba49 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/package.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/package.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 * }}} * diff --git a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/ActorTestKitTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java similarity index 96% rename from akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/ActorTestKitTest.java rename to akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java index df1a58bd8e..05bd47907a 100644 --- a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/ActorTestKitTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2018 Lightbend Inc. */ -package akka.testkit.typed.javadsl; +package akka.actor.testkit.typed.javadsl; import akka.Done; import akka.actor.typed.javadsl.Behaviors; diff --git a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/AsyncTestingExampleTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java similarity index 91% rename from akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/AsyncTestingExampleTest.java rename to akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java index 6a564cc36b..5f4529a8d7 100644 --- a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/AsyncTestingExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java @@ -2,13 +2,13 @@ * Copyright (C) 2017-2018 Lightbend Inc. */ -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; diff --git a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/JunitIntegrationExampleTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java similarity index 77% rename from akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/JunitIntegrationExampleTest.java rename to akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java index 6a4e10d594..786b8aa58e 100644 --- a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/JunitIntegrationExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java @@ -2,10 +2,10 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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; @@ -21,4 +21,4 @@ public class JunitIntegrationExampleTest { } } -// #junit-integration \ No newline at end of file +// #junit-integration diff --git a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/ManualTimerExampleTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java similarity index 86% rename from akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/ManualTimerExampleTest.java rename to akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java index 6e1aef52f1..8539ce440e 100644 --- a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/ManualTimerExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java @@ -2,13 +2,13 @@ * Copyright (C) 2017-2018 Lightbend Inc. */ -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 { diff --git a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java similarity index 98% rename from akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java rename to akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java index ff5f2c41de..e092f63c95 100644 --- a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/SyncTestingExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2018 Lightbend Inc. */ -package akka.testkit.typed.javadsl; +package akka.actor.testkit.typed.javadsl; //#imports import akka.actor.typed.*; diff --git a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/TestProbeTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java similarity index 97% rename from akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/TestProbeTest.java rename to akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java index aa1a03a13f..1e573c16ea 100644 --- a/akka-testkit-typed/src/test/java/akka/testkit/typed/javadsl/TestProbeTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -package akka.testkit.typed.javadsl; +package akka.actor.testkit.typed.javadsl; import akka.actor.typed.ActorRef; import akka.actor.typed.ActorSystem; diff --git a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AbstractActorSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AbstractActorSpec.scala similarity index 81% rename from akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AbstractActorSpec.scala rename to akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AbstractActorSpec.scala index faf075d42d..d444027a14 100644 --- a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AbstractActorSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AbstractActorSpec.scala @@ -2,11 +2,11 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -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 { diff --git a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/ActorTestKitSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala similarity index 97% rename from akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/ActorTestKitSpec.scala rename to akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala index f07bca4d4f..5aff0d67bd 100644 --- a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/ActorTestKitSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -package akka.testkit.typed.scaladsl +package akka.actor.testkit.typed.scaladsl import akka.actor.typed.Terminated import akka.actor.typed.scaladsl.Behaviors diff --git a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala similarity index 96% rename from akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala rename to akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala index 4ebf465268..9e548cb8d0 100644 --- a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018 Lightbend Inc. */ -package akka.testkit.typed.scaladsl +package akka.actor.testkit.typed.scaladsl import akka.actor.typed._ import akka.actor.typed.scaladsl.Behaviors diff --git a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/BehaviorTestKitSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala similarity index 96% rename from akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/BehaviorTestKitSpec.scala rename to akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala index 03514f7571..a933fe86b7 100644 --- a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/BehaviorTestKitSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala @@ -2,14 +2,14 @@ * Copyright (C) 2014-2018 Lightbend Inc. */ -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 { diff --git a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/ManualTimerExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala similarity index 98% rename from akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/ManualTimerExampleSpec.scala rename to akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala index dfe145eee4..df7dd2dcd0 100644 --- a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/ManualTimerExampleSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2018 Lightbend Inc. */ -package akka.testkit.typed.scaladsl +package akka.actor.testkit.typed.scaladsl //#manual-scheduling-simple import akka.actor.typed.scaladsl.Behaviors diff --git a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala similarity index 96% rename from akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala rename to akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala index b2cc6ef9bb..0e3e8a8f19 100644 --- a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/SyncTestingExampleSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala @@ -2,12 +2,12 @@ * Copyright (C) 2018 Lightbend Inc. */ -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 } diff --git a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/TestProbeSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala similarity index 98% rename from akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/TestProbeSpec.scala rename to akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala index e4223db543..1d1cd2c2f8 100644 --- a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/TestProbeSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2018 Lightbend Inc. */ -package akka.testkit.typed.scaladsl +package akka.actor.testkit.typed.scaladsl import akka.actor.typed.scaladsl.Behaviors diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java index a29612de9b..9e83d094c5 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java @@ -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 system = ActorSystem.create( Behavior.empty(), "loadJavaExtensionsFromConfig", diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java index 8c7474d7ff..c739ef69c7 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java @@ -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; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java index b3daf6c608..d391ca7ecc 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java @@ -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; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java index ead701649a..54d62a12aa 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java @@ -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; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java index 93ddc2e945..2a3b0b7976 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java @@ -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; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java index 665f9ef609..1dc305f577 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java @@ -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; diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala index 032dcaded3..9d58d72a0d 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala index eb3e6f27ad..f69e5a1a57 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala index 1bc0c8aa21..7c83e7ff9e 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala index 8b76b8f63c..b63de1ac72 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala index cbcd4c15ee..65e558f29e 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala @@ -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 ⇒ diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala index a7198d704b..196acb0788 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala index c53ea36df2..d59602c696 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala @@ -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 } diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala index f268bfc076..df1209edf9 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TypedAkkaSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TypedAkkaSpec.scala index 66f9bc3459..8771c57acf 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TypedAkkaSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TypedAkkaSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala index 615d8bc24f..844a3f20be 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala @@ -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._ diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala index 3960656026..acf9f18332 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala index 2a8e5a77a4..73cf63c9e3 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala @@ -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 } diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala index 8ed04bd7e0..d43586e90c 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala index ab51d9aad7..71216a6ae4 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala index 5cf800fe81..75c4c6920d 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala index e3b5e3e735..c50fa9ebbc 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala index 0bccc496ed..8497fc510b 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala index 99f004927b..412e2db50e 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala index 9c7e465e24..609fd55ce4 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala index cdc7e90d5c..dd7e03e1d1 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala index e4ba3a5dba..df9ef3815e 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala index 1f0b0b054e..10d661e858 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala index 701cf11e10..403b3638fe 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FaultToleranceDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FaultToleranceDocSpec.scala index 78900d7d45..f8656b3641 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FaultToleranceDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/FaultToleranceDocSpec.scala @@ -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 { diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala index c313fceec3..26717df7bb 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/GracefulStopDocSpec.scala @@ -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._ diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala index 5d6b7af227..69ae971e46 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/InteractionPatternsSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala index 65586b7ee9..e44552335b 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/MutableIntroSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/MutableIntroSpec.scala index 835f3d0eae..195e0ce4c4 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/MutableIntroSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/MutableIntroSpec.scala @@ -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 diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StashDocSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StashDocSpec.scala index 1294dd5219..fad70df255 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StashDocSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/StashDocSpec.scala @@ -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 diff --git a/akka-actor-typed/src/main/resources/reference.conf b/akka-actor-typed/src/main/resources/reference.conf index 782bb22d57..24f8bffc7d 100644 --- a/akka-actor-typed/src/main/resources/reference.conf +++ b/akka-actor-typed/src/main/resources/reference.conf @@ -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" diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala index 6cd03dfda8..adec8b3f65 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala @@ -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() diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala index fb1b47a95b..092f3d34c1 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala @@ -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 diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala index 177211b701..9d3e30b821 100644 --- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala +++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala @@ -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 diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala index 26560ca5b5..4941a35cf3 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala @@ -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 { diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala index f6aa11efe7..779e54903e 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala @@ -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 { diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala index e14e65f5d1..93ae68c8b9 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala @@ -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 diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala index d5a736d3a3..f5a112b703 100644 --- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala +++ b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala @@ -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._ diff --git a/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java b/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java index cced9868a0..3fbbaac428 100644 --- a/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java +++ b/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java @@ -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; @@ -62,4 +62,4 @@ public class ClusterApiTest extends JUnitSuite { } -} \ No newline at end of file +} diff --git a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java b/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java index 81a9d7e65b..4d55d86859 100644 --- a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java +++ b/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java @@ -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 diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala index 253d449a83..d112228148 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala @@ -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 diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala index fdc1a49c88..b73348d7f0 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala @@ -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 } diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala index 8bf9e474ed..ce4e086fcb 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala @@ -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 """) } diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala index c3895c3270..e63288d94f 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala @@ -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 diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala index 0262a98ccd..39a45a3a64 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala @@ -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 { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala index d7ddd8cdb4..6b2f641f0a 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala @@ -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 diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala index 3224a17f59..940a045fdc 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala @@ -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._ diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala index 74c0b0b5de..120cc0689e 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala @@ -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 { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala index 68d8b12666..19e817faf1 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala @@ -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 diff --git a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala b/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala index 0a6e0d2f6d..a189b23d00 100644 --- a/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala +++ b/akka-cluster-typed/src/test/scala/docs/akka/cluster/typed/BasicClusterExampleSpec.scala @@ -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 } diff --git a/akka-docs/src/main/paradox/typed/coexisting.md b/akka-docs/src/main/paradox/typed/coexisting.md index 56693eca8d..51023509f7 100644 --- a/akka-docs/src/main/paradox/typed/coexisting.md +++ b/akka-docs/src/main/paradox/typed/coexisting.md @@ -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 diff --git a/akka-docs/src/main/paradox/typed/testing.md b/akka-docs/src/main/paradox/typed/testing.md index f16a699ce8..89b798e6ab 100644 --- a/akka-docs/src/main/paradox/typed/testing.md +++ b/akka-docs/src/main/paradox/typed/testing.md @@ -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 } diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java index 0c6443e42b..bdaf97b012 100644 --- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java +++ b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java @@ -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.*; diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorTest.java b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorTest.java index a4e52a3f0e..4515f38147 100644 --- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorTest.java +++ b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorTest.java @@ -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; diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala index 0132df38e8..103c5df1c1 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala @@ -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 diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/EventsourcedStashReferenceManagementTest.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/EventsourcedStashReferenceManagementTest.scala index 036ba7fc18..45d0ff3aac 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/EventsourcedStashReferenceManagementTest.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/EventsourcedStashReferenceManagementTest.scala @@ -8,7 +8,7 @@ import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.{ Behavior, Signal, TypedAkkaSpecWithShutdown } import akka.persistence.typed.internal.EventsourcedBehavior.InternalProtocol import akka.persistence.typed.internal.EventsourcedBehavior.InternalProtocol.{ IncomingCommand, RecoveryPermitGranted } -import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe } +import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe } import scala.concurrent.duration.{ FiniteDuration, _ } diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala index 7df4567cb1..83d6661eaa 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala @@ -12,7 +12,7 @@ import akka.persistence.Persistence import akka.persistence.RecoveryPermitter.{ RecoveryPermitGranted, RequestRecoveryPermit, ReturnRecoveryPermit } import akka.persistence.typed.scaladsl.PersistentBehaviors.CommandHandler 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.{ Config, ConfigFactory } import org.scalatest.concurrent.Eventually diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala index d75d643c47..1cd7626130 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala @@ -10,7 +10,7 @@ import akka.actor.typed.TypedAkkaSpecWithShutdown import akka.actor.typed.scaladsl.adapter.{ TypedActorRefOps, TypedActorSystemOps } import akka.event.Logging import akka.persistence.typed.scaladsl.PersistentBehaviors.CommandHandler -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 diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala index b454674804..615dcd9fd0 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala @@ -9,8 +9,8 @@ import java.util.UUID import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.{ ActorRef, SupervisorStrategy, TypedAkkaSpecWithShutdown } import akka.persistence.typed.scaladsl.PersistentBehaviors.CommandHandler -import akka.testkit.typed.TE -import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe } +import akka.actor.testkit.typed.TE +import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, TestProbe } import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.concurrent.Eventually diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentBehaviorSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentBehaviorSpec.scala index dc83c6da85..6000880184 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentBehaviorSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentBehaviorSpec.scala @@ -10,8 +10,8 @@ import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, SupervisorStrategy, Terminated, TypedAkkaSpecWithShutdown } import akka.persistence.snapshot.SnapshotStore import akka.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria } -import akka.testkit.typed.TestKitSettings -import akka.testkit.typed.scaladsl._ +import akka.actor.testkit.typed.TestKitSettings +import akka.actor.testkit.typed.scaladsl._ import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.concurrent.Eventually diff --git a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorFlowSpec.scala b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorFlowSpec.scala index d955d13caa..ca2246096f 100644 --- a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorFlowSpec.scala +++ b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorFlowSpec.scala @@ -16,7 +16,7 @@ import scala.concurrent.duration._ //#imports import akka.actor.typed.{ DispatcherSelector, TypedAkkaSpecWithShutdown } import akka.stream.testkit.TestSubscriber -import akka.testkit.typed.scaladsl.ActorTestKit +import akka.actor.testkit.typed.scaladsl.ActorTestKit import scala.collection.immutable import scala.concurrent.{ Await, Future } diff --git a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorSourceSinkSpec.scala b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorSourceSinkSpec.scala index 72cfc8360a..c8f1c5a597 100644 --- a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorSourceSinkSpec.scala +++ b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorSourceSinkSpec.scala @@ -12,7 +12,7 @@ import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source import akka.stream.typed.ActorMaterializer -import akka.testkit.typed.scaladsl.{ ActorTestKit, _ } +import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, _ } object ActorSourceSinkSpec { diff --git a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/CustomGuardianAndMaterializerSpec.scala b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/CustomGuardianAndMaterializerSpec.scala index a3a0dfd23a..a3f32c6d20 100644 --- a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/CustomGuardianAndMaterializerSpec.scala +++ b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/CustomGuardianAndMaterializerSpec.scala @@ -11,7 +11,7 @@ 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.scaladsl.ActorTestKit +import akka.actor.testkit.typed.scaladsl.ActorTestKit object CustomGuardianAndMaterializerSpec { diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/BehaviorTestkit.scala b/akka-testkit-typed/src/main/scala/akka/testkit/typed/BehaviorTestkit.scala deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/Effect.scala b/akka-testkit-typed/src/main/scala/akka/testkit/typed/Effect.scala deleted file mode 100644 index 2475f14718..0000000000 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/Effect.scala +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright (C) 2014-2018 Lightbend Inc. - */ - -package akka.testkit.typed - -import akka.annotation.DoNotInherit - -/** - * All tracked effects for the [[akka.testkit.typed.scaladsl.BehaviorTestKit]] and - * [[akka.testkit.typed.javadsl.BehaviorTestKit]] must extend this type. - * - * Factories/types for effects are available through [[akka.testkit.typed.scaladsl.Effects]] - * and [[akka.testkit.typed.javadsl.Effects]] - * - * Not for user extension - */ -@DoNotInherit -abstract class Effect private[akka] () - diff --git a/build.sbt b/build.sbt index 79887c9328..ea2a8584df 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,7 @@ lazy val aggregatedProjects: Seq[ProjectReference] = Seq( slf4j, stream, streamTestkit, streamTests, streamTestsTck, testkit, - actorTyped, actorTypedTests, typedTestkit, + actorTyped, actorTypedTests, actorTestkitTyped, persistenceTyped, clusterTyped, clusterShardingTyped, streamTyped @@ -397,7 +397,7 @@ lazy val persistenceTyped = akkaModule("akka-persistence-typed") .dependsOn( actorTyped, persistence, - typedTestkit % "test->test", + actorTestkitTyped % "test->test", actorTypedTests % "test->test" ) .settings(Dependencies.persistenceShared) @@ -414,7 +414,7 @@ lazy val clusterTyped = akkaModule("akka-cluster-typed") persistence % "test->test", persistenceTyped % "test->test", protobuf, - typedTestkit % "test->test", + actorTestkitTyped % "test->test", actorTypedTests % "test->test", remoteTests % "test->test" ) @@ -429,7 +429,7 @@ lazy val clusterShardingTyped = akkaModule("akka-cluster-sharding-typed") clusterTyped % "compile->compile;test->test;multi-jvm->multi-jvm", persistenceTyped, clusterSharding, - typedTestkit % "test->test", + actorTestkitTyped % "test->test", actorTypedTests % "test->test", persistenceTyped % "test->test", remoteTests % "test->test" @@ -447,7 +447,7 @@ lazy val streamTyped = akkaModule("akka-stream-typed") actorTyped, stream, streamTestkit % "test->test", - typedTestkit % "test->test", + actorTestkitTyped % "test->test", actorTypedTests % "test->test" ) .settings(AkkaBuild.mayChangeSettings) @@ -455,16 +455,16 @@ lazy val streamTyped = akkaModule("akka-stream-typed") .disablePlugins(MimaPlugin) .enablePlugins(ScaladocNoVerificationOfDiagrams) -lazy val typedTestkit = akkaModule("akka-testkit-typed") +lazy val actorTestkitTyped = akkaModule("akka-actor-testkit-typed") .dependsOn(actorTyped, testkit % "compile->compile;test->test") - .settings(AutomaticModuleName.settings("akka.testkit.typed")) - .settings(Dependencies.typedTestkit) + .settings(AutomaticModuleName.settings("akka.actor.testkit.typed")) + .settings(Dependencies.actorTestkitTyped) .disablePlugins(MimaPlugin) lazy val actorTypedTests = akkaModule("akka-actor-typed-tests") .dependsOn( actorTyped, - typedTestkit % "compile->compile;test->test" + actorTestkitTyped % "compile->compile;test->test" ) .settings(AkkaBuild.mayChangeSettings) .disablePlugins(MimaPlugin) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fd86ef203c..1cd3588ea6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -138,7 +138,7 @@ object Dependencies { val actorTests = l ++= Seq(Test.junit, Test.scalatest.value, Test.commonsCodec, Test.commonsMath, Test.mockito, Test.scalacheck.value, Test.jimfs) - val typedTestkit = l ++= Seq(Provided.junit) + val actorTestkitTyped = l ++= Seq(Provided.junit) val remote = l ++= Seq(netty, aeronDriver, aeronClient, Test.junit, Test.scalatest.value, Test.jimfs)