From e56ac943a2fd504ef720c23478d718ce218e8228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Fri, 5 May 2017 14:04:32 +0200 Subject: [PATCH] Moved typed inbox to testkit #22753 --- .../main/scala/akka/typed/testkit}/Inbox.scala | 15 +++++++-------- .../src/test/scala/akka/typed/BehaviorSpec.scala | 2 +- .../src/test/scala/akka/typed/DeferredSpec.scala | 4 +--- .../src/test/scala/akka/typed/RestarterSpec.scala | 5 +++-- .../src/test/scala/akka/typed/TypedSpec.scala | 3 ++- .../akka/typed/internal/ActorSystemSpec.scala | 1 + .../akka/typed/internal/ActorSystemStub.scala | 3 +++ .../akka/typed/internal/EventStreamSpec.scala | 1 + .../akka/typed/patterns/ReceptionistSpec.scala | 2 +- 9 files changed, 20 insertions(+), 16 deletions(-) rename {akka-typed/src/main/scala/akka/typed => akka-typed-testkit/src/main/scala/akka/typed/testkit}/Inbox.scala (84%) diff --git a/akka-typed/src/main/scala/akka/typed/Inbox.scala b/akka-typed-testkit/src/main/scala/akka/typed/testkit/Inbox.scala similarity index 84% rename from akka-typed/src/main/scala/akka/typed/Inbox.scala rename to akka-typed-testkit/src/main/scala/akka/typed/testkit/Inbox.scala index 233a12713e..42cd305b50 100644 --- a/akka-typed/src/main/scala/akka/typed/Inbox.scala +++ b/akka-typed-testkit/src/main/scala/akka/typed/testkit/Inbox.scala @@ -1,16 +1,15 @@ /** * Copyright (C) 2014-2017 Lightbend Inc. */ -package akka.typed +package akka.typed.testkit + +import java.util.concurrent.{ ConcurrentLinkedQueue, ThreadLocalRandom } + +import akka.actor.{ Address, RootActorPath } +import akka.typed.{ ActorRef, internal } -import java.util.concurrent.ConcurrentLinkedQueue -import akka.actor.ActorPath -import akka.actor.RootActorPath -import akka.actor.Address -import scala.collection.immutable import scala.annotation.tailrec -import akka.actor.ActorRefProvider -import java.util.concurrent.ThreadLocalRandom +import scala.collection.immutable /** * Utility for receiving messages outside of an actor. No methods are provided diff --git a/akka-typed-tests/src/test/scala/akka/typed/BehaviorSpec.scala b/akka-typed-tests/src/test/scala/akka/typed/BehaviorSpec.scala index c136736d6a..3b2adaf8a9 100644 --- a/akka-typed-tests/src/test/scala/akka/typed/BehaviorSpec.scala +++ b/akka-typed-tests/src/test/scala/akka/typed/BehaviorSpec.scala @@ -10,7 +10,7 @@ import akka.japi.pf.{ FI, PFBuilder } import java.util.function.{ Function ⇒ F1 } import akka.Done -import akka.typed.testkit.EffectfulActorContext +import akka.typed.testkit.{ EffectfulActorContext, Inbox } class BehaviorSpec extends TypedSpec { diff --git a/akka-typed-tests/src/test/scala/akka/typed/DeferredSpec.scala b/akka-typed-tests/src/test/scala/akka/typed/DeferredSpec.scala index b61b975302..1fc798c28f 100644 --- a/akka-typed-tests/src/test/scala/akka/typed/DeferredSpec.scala +++ b/akka-typed-tests/src/test/scala/akka/typed/DeferredSpec.scala @@ -6,12 +6,10 @@ package akka.typed import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace - import akka.typed.scaladsl.Actor import akka.typed.scaladsl.Actor.BehaviorDecorators import akka.typed.scaladsl.AskPattern._ -import akka.typed.testkit.EffectfulActorContext -import akka.typed.testkit.TestKitSettings +import akka.typed.testkit.{ EffectfulActorContext, Inbox, TestKitSettings } import akka.typed.testkit.scaladsl._ @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) diff --git a/akka-typed-tests/src/test/scala/akka/typed/RestarterSpec.scala b/akka-typed-tests/src/test/scala/akka/typed/RestarterSpec.scala index dbb9845196..526a1996f5 100644 --- a/akka-typed-tests/src/test/scala/akka/typed/RestarterSpec.scala +++ b/akka-typed-tests/src/test/scala/akka/typed/RestarterSpec.scala @@ -5,11 +5,12 @@ package akka.typed import scala.concurrent.duration._ import akka.typed.scaladsl.Actor._ -import akka.typed.testkit.EffectfulActorContext +import akka.typed.testkit.{ EffectfulActorContext, Inbox, TestKitSettings } + import scala.util.control.NoStackTrace -import akka.typed.testkit.TestKitSettings import akka.typed.testkit.scaladsl._ import akka.typed.scaladsl.AskPattern._ + import scala.concurrent.Await @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) diff --git a/akka-typed-tests/src/test/scala/akka/typed/TypedSpec.scala b/akka-typed-tests/src/test/scala/akka/typed/TypedSpec.scala index 5fc3c091e0..79cdf1c3fe 100644 --- a/akka-typed-tests/src/test/scala/akka/typed/TypedSpec.scala +++ b/akka-typed-tests/src/test/scala/akka/typed/TypedSpec.scala @@ -29,8 +29,9 @@ import org.junit.runner.RunWith import scala.util.control.NonFatal import org.scalatest.exceptions.TestFailedException import akka.typed.scaladsl.AskPattern + import scala.util.control.NoStackTrace -import akka.typed.testkit.TestKitSettings +import akka.typed.testkit.{ Inbox, TestKitSettings } /** * Helper class for writing tests for typed Actors with ScalaTest. diff --git a/akka-typed-tests/src/test/scala/akka/typed/internal/ActorSystemSpec.scala b/akka-typed-tests/src/test/scala/akka/typed/internal/ActorSystemSpec.scala index 4f2c0120b9..003358eec1 100644 --- a/akka-typed-tests/src/test/scala/akka/typed/internal/ActorSystemSpec.scala +++ b/akka-typed-tests/src/test/scala/akka/typed/internal/ActorSystemSpec.scala @@ -7,6 +7,7 @@ package internal import akka.Done import akka.typed.scaladsl.Actor import akka.typed.scaladsl.Actor._ +import akka.typed.testkit.Inbox import akka.util.Timeout import org.junit.runner.RunWith import org.scalactic.ConversionCheckedTripleEquals diff --git a/akka-typed-tests/src/test/scala/akka/typed/internal/ActorSystemStub.scala b/akka-typed-tests/src/test/scala/akka/typed/internal/ActorSystemStub.scala index 2060f5898c..ae080526c5 100644 --- a/akka-typed-tests/src/test/scala/akka/typed/internal/ActorSystemStub.scala +++ b/akka-typed-tests/src/test/scala/akka/typed/internal/ActorSystemStub.scala @@ -5,9 +5,12 @@ package akka.typed package internal import akka.{ actor ⇒ a, event ⇒ e } + import scala.concurrent._ import com.typesafe.config.ConfigFactory import java.util.concurrent.ThreadFactory + +import akka.typed.testkit.Inbox import akka.util.Timeout private[typed] class ActorSystemStub(val name: String) diff --git a/akka-typed-tests/src/test/scala/akka/typed/internal/EventStreamSpec.scala b/akka-typed-tests/src/test/scala/akka/typed/internal/EventStreamSpec.scala index 9f40b3e7a1..3b8dc64acc 100644 --- a/akka-typed-tests/src/test/scala/akka/typed/internal/EventStreamSpec.scala +++ b/akka-typed-tests/src/test/scala/akka/typed/internal/EventStreamSpec.scala @@ -8,6 +8,7 @@ import akka.Done import akka.event.Logging._ import akka.typed.scaladsl.Actor._ import akka.typed.scaladsl.AskPattern._ +import akka.typed.testkit.Inbox import com.typesafe.config.ConfigFactory import org.scalatest.concurrent.Eventually import org.scalatest.concurrent.PatienceConfiguration.Timeout diff --git a/akka-typed-tests/src/test/scala/akka/typed/patterns/ReceptionistSpec.scala b/akka-typed-tests/src/test/scala/akka/typed/patterns/ReceptionistSpec.scala index ad80d1c603..e7d54af006 100644 --- a/akka-typed-tests/src/test/scala/akka/typed/patterns/ReceptionistSpec.scala +++ b/akka-typed-tests/src/test/scala/akka/typed/patterns/ReceptionistSpec.scala @@ -10,7 +10,7 @@ import scala.concurrent.duration._ import akka.typed._ import akka.typed.scaladsl.Actor import akka.typed.scaladsl.Actor._ -import akka.typed.testkit.{ Effect, EffectfulActorContext } +import akka.typed.testkit.{ Effect, EffectfulActorContext, Inbox } class ReceptionistSpec extends TypedSpec {