From 45e97e84678507d5e8eebfff6e63262b0f8681f6 Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Thu, 25 Feb 2016 14:27:45 +0100 Subject: [PATCH] remove akka.stream.testkit.AkkaSpec, fixes #19879 --- .../test/scala/akka/actor/FSMActorSpec.scala | 3 +- .../src/test/scala/akka/pattern/AskSpec.scala | 3 +- .../scala/akka/pattern/PromiseRefSpec.scala | 3 +- .../pattern/extended/ExplicitAskSpec.scala | 3 +- .../scala/akka/util/TypedMultiMapSpec.scala | 4 +- .../CircuitBreakerProxySpec.scala | 5 +- .../code/docs/http/scaladsl/MarshalSpec.scala | 2 +- .../code/docs/http/scaladsl/ModelSpec.scala | 2 +- .../docs/http/scaladsl/UnmarshalSpec.scala | 2 +- .../docs/stream/ActorPublisherDocSpec.scala | 2 +- .../docs/stream/ActorSubscriberDocSpec.scala | 2 +- .../code/docs/stream/BidiFlowDocSpec.scala | 4 +- .../code/docs/stream/CompositionDocSpec.scala | 2 +- .../scala/code/docs/stream/FlowDocSpec.scala | 2 +- .../code/docs/stream/FlowErrorDocSpec.scala | 2 +- .../code/docs/stream/FlowGraphDocSpec.scala | 2 +- .../docs/stream/FlowParallelismDocSpec.scala | 2 +- .../code/docs/stream/GraphCyclesSpec.scala | 2 +- .../code/docs/stream/GraphStageDocSpec.scala | 6 +- .../code/docs/stream/IntegrationDocSpec.scala | 2 +- .../code/docs/stream/MigrationsScala.scala | 2 +- .../stream/RateTransformationDocSpec.scala | 2 +- .../docs/stream/ReactiveStreamsDocSpec.scala | 1 + .../docs/stream/StreamBuffersRateSpec.scala | 2 +- .../StreamPartialFlowGraphDocSpec.scala | 2 +- .../docs/stream/StreamTestKitDocSpec.scala | 2 +- .../TwitterStreamQuickstartDocSpec.scala | 2 +- .../code/docs/stream/cookbook/RecipeSeq.scala | 3 +- .../docs/stream/cookbook/RecipeSpec.scala | 2 +- .../docs/stream/io/StreamFileDocSpec.scala | 1 + .../docs/stream/io/StreamTcpDocSpec.scala | 2 +- .../client/ClientCancellationSpec.scala | 4 +- .../engine/client/ConnectionPoolSpec.scala | 4 +- .../HighLevelOutgoingConnectionSpec.scala | 5 +- .../engine/client/HttpConfigurationSpec.scala | 2 +- .../LowLevelOutgoingConnectionSpec.scala | 8 +- .../engine/client/PrepareResponseSpec.scala | 3 +- .../client/TlsEndpointVerificationSpec.scala | 5 +- .../impl/engine/server/HttpServerSpec.scala | 5 +- .../engine/ws/WebSocketIntegrationSpec.scala | 5 +- .../http/impl/util/One2OneBidiFlowSpec.scala | 7 +- .../akka/http/javadsl/ConnectHttpSpec.scala | 4 +- .../http/javadsl/HttpExtensionApiSpec.scala | 2 +- .../akka/http/scaladsl/FormDataSpec.scala | 10 +- .../scala/akka/stream/testkit/AkkaSpec.scala | 105 ------------------ .../stream/testkit/BaseTwoStreamsSetup.scala | 1 + .../stream/testkit/StreamTestKitSpec.scala | 2 +- .../testkit/TestPublisherSubscriberSpec.scala | 1 + .../stream/tck/ActorSystemLifecycle.scala | 2 +- .../akka/stream/tck/FilePublisherTest.scala | 2 +- .../akka/stream/actor/ActorPublisherTest.java | 2 +- .../stream/actor/ActorSubscriberTest.java | 2 +- .../akka/stream/io/InputStreamSinkTest.java | 2 +- .../javadsl/AkkaJUnitActorSystemResource.java | 2 +- .../akka/stream/javadsl/AttributesTest.java | 2 +- .../akka/stream/javadsl/BidiFlowTest.java | 2 +- .../akka/stream/javadsl/FlowGraphTest.java | 2 +- .../java/akka/stream/javadsl/FlowTest.java | 2 +- .../java/akka/stream/javadsl/FramingTest.java | 2 +- .../java/akka/stream/javadsl/SinkTest.java | 2 +- .../java/akka/stream/javadsl/SourceTest.java | 2 +- .../java/akka/stream/javadsl/TcpTest.java | 2 +- .../java/akka/stream/stage/StageTest.java | 2 +- .../akka/stream/ActorMaterializerSpec.scala | 3 +- .../test/scala/akka/stream/FusingSpec.scala | 5 +- .../stream/actor/ActorPublisherSpec.scala | 2 +- .../stream/actor/ActorSubscriberSpec.scala | 2 +- .../akka/stream/extra/FlowTimedSpec.scala | 1 + .../akka/stream/impl/FixedBufferSpec.scala | 2 +- .../stream/impl/GraphStageLogicSpec.scala | 4 +- .../akka/stream/impl/StreamLayoutSpec.scala | 2 +- .../scala/akka/stream/impl/TimeoutsSpec.scala | 5 +- .../fusing/ActorGraphInterpreterSpec.scala | 5 +- .../GraphInterpreterFailureModesSpec.scala | 2 +- .../fusing/GraphInterpreterPortsSpec.scala | 2 +- .../impl/fusing/GraphInterpreterSpec.scala | 2 +- .../impl/fusing/GraphInterpreterSpecKit.scala | 2 +- .../stream/impl/fusing/InterpreterSpec.scala | 2 +- .../impl/fusing/InterpreterStressSpec.scala | 4 +- .../fusing/InterpreterSupervisionSpec.scala | 2 +- .../impl/fusing/IteratorInterpreterSpec.scala | 2 +- .../impl/fusing/KeepGoingStageSpec.scala | 2 +- .../fusing/LifecycleInterpreterSpec.scala | 2 +- .../scala/akka/stream/io/FileSinkSpec.scala | 4 +- .../scala/akka/stream/io/FileSourceSpec.scala | 3 +- .../akka/stream/io/InputStreamSinkSpec.scala | 5 +- .../stream/io/InputStreamSourceSpec.scala | 3 +- .../akka/stream/io/OutputStreamSinkSpec.scala | 2 +- .../stream/io/OutputStreamSourceSpec.scala | 3 +- .../test/scala/akka/stream/io/TcpSpec.scala | 1 + .../test/scala/akka/stream/io/TlsSpec.scala | 2 +- .../ActorRefBackpressureSinkSpec.scala | 4 +- .../stream/scaladsl/ActorRefSinkSpec.scala | 1 + .../stream/scaladsl/ActorRefSourceSpec.scala | 1 + .../akka/stream/scaladsl/AttributesSpec.scala | 3 +- .../akka/stream/scaladsl/BidiFlowSpec.scala | 4 +- .../akka/stream/scaladsl/FlowAppendSpec.scala | 3 +- .../akka/stream/scaladsl/FlowBatchSpec.scala | 1 + .../scaladsl/FlowBatchWeightedSpec.scala | 1 + .../akka/stream/scaladsl/FlowBufferSpec.scala | 1 + .../stream/scaladsl/FlowCollectSpec.scala | 2 +- .../stream/scaladsl/FlowCompileSpec.scala | 2 +- .../stream/scaladsl/FlowConcatAllSpec.scala | 1 + .../stream/scaladsl/FlowConflateSpec.scala | 2 +- .../akka/stream/scaladsl/FlowDelaySpec.scala | 4 +- .../stream/scaladsl/FlowDetacherSpec.scala | 5 +- .../stream/scaladsl/FlowDispatcherSpec.scala | 2 +- .../akka/stream/scaladsl/FlowDropSpec.scala | 2 +- .../stream/scaladsl/FlowDropWhileSpec.scala | 3 +- .../stream/scaladsl/FlowDropWithinSpec.scala | 4 +- .../akka/stream/scaladsl/FlowExpandSpec.scala | 1 + .../akka/stream/scaladsl/FlowFilterSpec.scala | 2 +- .../scaladsl/FlowFlattenMergeSpec.scala | 6 +- .../akka/stream/scaladsl/FlowFoldSpec.scala | 2 +- .../stream/scaladsl/FlowForeachSpec.scala | 1 + .../stream/scaladsl/FlowFromFutureSpec.scala | 2 +- .../scaladsl/FlowGraphCompileSpec.scala | 1 + .../stream/scaladsl/FlowGroupBySpec.scala | 4 +- .../stream/scaladsl/FlowGroupedSpec.scala | 2 +- .../scaladsl/FlowGroupedWithinSpec.scala | 2 +- .../stream/scaladsl/FlowIdleInjectSpec.scala | 4 +- .../scaladsl/FlowInitialDelaySpec.scala | 5 +- .../stream/scaladsl/FlowIntersperseSpec.scala | 4 +- .../stream/scaladsl/FlowIteratorSpec.scala | 1 + .../akka/stream/scaladsl/FlowJoinSpec.scala | 3 +- .../akka/stream/scaladsl/FlowLimitSpec.scala | 2 +- .../scaladsl/FlowLimitWeightedSpec.scala | 2 +- .../akka/stream/scaladsl/FlowLogSpec.scala | 4 +- .../stream/scaladsl/FlowMapAsyncSpec.scala | 3 +- .../scaladsl/FlowMapAsyncUnorderedSpec.scala | 3 +- .../stream/scaladsl/FlowMapConcatSpec.scala | 2 +- .../akka/stream/scaladsl/FlowMapSpec.scala | 2 +- .../stream/scaladsl/FlowOnCompleteSpec.scala | 3 +- .../scaladsl/FlowPrefixAndTailSpec.scala | 1 + .../stream/scaladsl/FlowRecoverSpec.scala | 2 +- .../stream/scaladsl/FlowRecoverWithSpec.scala | 2 +- .../akka/stream/scaladsl/FlowReduceSpec.scala | 2 +- .../akka/stream/scaladsl/FlowScanSpec.scala | 2 +- .../stream/scaladsl/FlowSectionSpec.scala | 4 +- .../stream/scaladsl/FlowSlidingSpec.scala | 3 +- .../scala/akka/stream/scaladsl/FlowSpec.scala | 4 +- .../stream/scaladsl/FlowSplitAfterSpec.scala | 2 +- .../stream/scaladsl/FlowSplitWhenSpec.scala | 1 + .../akka/stream/scaladsl/FlowStageSpec.scala | 1 + .../scaladsl/FlowStatefulMapConcatSpec.scala | 2 +- .../stream/scaladsl/FlowSupervisionSpec.scala | 1 + .../akka/stream/scaladsl/FlowTakeSpec.scala | 2 +- .../stream/scaladsl/FlowTakeWhileSpec.scala | 3 +- .../stream/scaladsl/FlowTakeWithinSpec.scala | 2 +- .../stream/scaladsl/FlowThrottleSpec.scala | 2 +- .../scaladsl/FlowWatchTerminationSpec.scala | 5 +- .../akka/stream/scaladsl/FramingSpec.scala | 2 +- .../stream/scaladsl/GraphBackedFlowSpec.scala | 1 + .../stream/scaladsl/GraphBalanceSpec.scala | 2 +- .../stream/scaladsl/GraphBroadcastSpec.scala | 3 +- .../stream/scaladsl/GraphMatValueSpec.scala | 2 +- .../scaladsl/GraphMergeSortedSpec.scala | 3 +- .../scaladsl/GraphOpsIntegrationSpec.scala | 4 +- .../stream/scaladsl/GraphPartialSpec.scala | 2 +- .../stream/scaladsl/GraphPartitionSpec.scala | 3 +- .../scaladsl/GraphStageTimersSpec.scala | 2 +- .../akka/stream/scaladsl/GraphUnzipSpec.scala | 2 +- .../stream/scaladsl/GraphUnzipWithSpec.scala | 1 + .../akka/stream/scaladsl/HeadSinkSpec.scala | 1 + .../akka/stream/scaladsl/LastSinkSpec.scala | 1 + .../stream/scaladsl/PublisherSinkSpec.scala | 2 +- .../akka/stream/scaladsl/QueueSinkSpec.scala | 7 +- .../stream/scaladsl/QueueSourceSpec.scala | 6 +- .../stream/scaladsl/ReverseArrowSpec.scala | 3 +- .../akka/stream/scaladsl/SeqSinkSpec.scala | 2 +- .../scaladsl/SinkForeachParallelSpec.scala | 2 +- .../scala/akka/stream/scaladsl/SinkSpec.scala | 5 +- .../akka/stream/scaladsl/SourceSpec.scala | 3 +- .../stream/scaladsl/StageActorRefSpec.scala | 5 +- .../stream/scaladsl/SubscriberSinkSpec.scala | 1 + .../scaladsl/SubscriberSourceSpec.scala | 2 +- .../SubstreamSubscriptionTimeoutSpec.scala | 1 + .../akka/stream/scaladsl/TickSourceSpec.scala | 1 + .../test/scala/akka/testkit/AkkaSpec.scala | 14 ++- .../scala/akka/typed/ActorContextSpec.scala | 2 +- .../test/scala/akka/typed/BehaviorSpec.scala | 2 +- .../src/test/scala/akka/typed/TypedSpec.scala | 19 +++- project/AkkaBuild.scala | 2 +- 183 files changed, 265 insertions(+), 346 deletions(-) delete mode 100644 akka-stream-testkit/src/test/scala/akka/stream/testkit/AkkaSpec.scala diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala index 30900cb3ee..c5403001a8 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala @@ -13,7 +13,6 @@ import scala.concurrent.Await import akka.util.Timeout object FSMActorSpec { - val timeout = Timeout(2 seconds) class Latches(implicit system: ActorSystem) { val unlockedLatch = TestLatch() @@ -103,6 +102,8 @@ object FSMActorSpec { class FSMActorSpec extends AkkaSpec(Map("akka.actor.debug.fsm" -> true)) with ImplicitSender { import FSMActorSpec._ + val timeout = Timeout(2 seconds) + "An FSM Actor" must { "unlock the lock" in { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala index 35f6ba3e1c..2fac82ab20 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala @@ -14,7 +14,7 @@ import scala.util.Failure import language.postfixOps -class AskSpec extends AkkaSpec with ScalaFutures { +class AskSpec extends AkkaSpec { "The “ask” pattern" must { "send request to actor and wrap the answer in Future" in { @@ -230,4 +230,3 @@ class AskSpec extends AkkaSpec with ScalaFutures { } } - diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala index 96cf17e541..ad0bd015d6 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala @@ -18,7 +18,7 @@ object PromiseRefSpec { case object SecondMessage } -class PromiseRefSpec extends AkkaSpec with ImplicitSender with ScalaFutures { +class PromiseRefSpec extends AkkaSpec with ImplicitSender { import PromiseRefSpec._ import akka.pattern._ @@ -71,4 +71,3 @@ class PromiseRefSpec extends AkkaSpec with ImplicitSender with ScalaFutures { } } } - diff --git a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala index f11669c9ab..9a05eceaa7 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala @@ -14,7 +14,7 @@ object ExplicitAskSpec { case class Response(sentFrom: ActorRef) } -class ExplicitAskSpec extends AkkaSpec with ScalaFutures { +class ExplicitAskSpec extends AkkaSpec { import ExplicitAskSpec._ "The “ask” pattern with explicit sender" must { @@ -47,4 +47,3 @@ class ExplicitAskSpec extends AkkaSpec with ScalaFutures { } } - diff --git a/akka-actor-tests/src/test/scala/akka/util/TypedMultiMapSpec.scala b/akka-actor-tests/src/test/scala/akka/util/TypedMultiMapSpec.scala index 5960eceffc..4e910899c4 100644 --- a/akka-actor-tests/src/test/scala/akka/util/TypedMultiMapSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/TypedMultiMapSpec.scala @@ -5,7 +5,7 @@ package akka.util import org.scalatest.WordSpec import org.scalatest.Matchers -import org.scalautils.ConversionCheckedTripleEquals +import org.scalactic.ConversionCheckedTripleEquals object TypedMultiMapSpec { trait AbstractKey { type Type } @@ -69,4 +69,4 @@ class TypedMultiMapSpec extends WordSpec with Matchers with ConversionCheckedTri } -} \ No newline at end of file +} diff --git a/akka-contrib/src/test/scala/akka/contrib/circuitbreaker/CircuitBreakerProxySpec.scala b/akka-contrib/src/test/scala/akka/contrib/circuitbreaker/CircuitBreakerProxySpec.scala index 5b13f284df..8ba86e42df 100644 --- a/akka-contrib/src/test/scala/akka/contrib/circuitbreaker/CircuitBreakerProxySpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/circuitbreaker/CircuitBreakerProxySpec.scala @@ -7,14 +7,13 @@ import akka.actor.{ ActorRef, PoisonPill } import akka.contrib.circuitbreaker.CircuitBreakerProxy._ import akka.testkit.{ AkkaSpec, TestProbe } import akka.util.Timeout -import org.scalatest.concurrent.ScalaFutures import org.scalatest.time.{ Millis, Second, Span } import org.scalatest.{ GivenWhenThen, Matchers } import scala.concurrent.duration._ import scala.language.postfixOps -class CircuitBreakerProxySpec extends AkkaSpec() with GivenWhenThen with Matchers with ScalaFutures { +class CircuitBreakerProxySpec extends AkkaSpec() with GivenWhenThen { val baseCircuitBreakerPropsBuilder = CircuitBreakerPropsBuilder( @@ -439,7 +438,6 @@ class CircuitBreakerProxySpec extends AkkaSpec() with GivenWhenThen with Matcher } "Ask Extension" should { - implicit val patienceConfig = PatienceConfig(timeout = Span(1, Second), interval = Span(100, Millis)) import Implicits.askWithCircuitBreaker import scala.concurrent.ExecutionContext.Implicits.global @@ -488,7 +486,6 @@ class CircuitBreakerProxySpec extends AkkaSpec() with GivenWhenThen with Matcher } "Future Extension" should { - implicit val patienceConfig = PatienceConfig(timeout = Span(1, Second), interval = Span(100, Millis)) import Implicits.futureExtensions import akka.pattern.ask diff --git a/akka-docs/rst/scala/code/docs/http/scaladsl/MarshalSpec.scala b/akka-docs/rst/scala/code/docs/http/scaladsl/MarshalSpec.scala index 096362fa04..e88dab2925 100644 --- a/akka-docs/rst/scala/code/docs/http/scaladsl/MarshalSpec.scala +++ b/akka-docs/rst/scala/code/docs/http/scaladsl/MarshalSpec.scala @@ -4,7 +4,7 @@ package docs.http.scaladsl -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec class MarshalSpec extends AkkaSpec { diff --git a/akka-docs/rst/scala/code/docs/http/scaladsl/ModelSpec.scala b/akka-docs/rst/scala/code/docs/http/scaladsl/ModelSpec.scala index d7e5d00cd0..63ecd5bd46 100644 --- a/akka-docs/rst/scala/code/docs/http/scaladsl/ModelSpec.scala +++ b/akka-docs/rst/scala/code/docs/http/scaladsl/ModelSpec.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.model._ //#import-model -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.util.ByteString import akka.http.scaladsl.model.headers.BasicHttpCredentials diff --git a/akka-docs/rst/scala/code/docs/http/scaladsl/UnmarshalSpec.scala b/akka-docs/rst/scala/code/docs/http/scaladsl/UnmarshalSpec.scala index e4d4ee13bd..a6fb09d50c 100644 --- a/akka-docs/rst/scala/code/docs/http/scaladsl/UnmarshalSpec.scala +++ b/akka-docs/rst/scala/code/docs/http/scaladsl/UnmarshalSpec.scala @@ -5,7 +5,7 @@ package docs.http.scaladsl import akka.stream.{ Materializer, ActorMaterializer } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec class UnmarshalSpec extends AkkaSpec { diff --git a/akka-docs/rst/scala/code/docs/stream/ActorPublisherDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/ActorPublisherDocSpec.scala index f62dd2fa26..c65d550044 100644 --- a/akka-docs/rst/scala/code/docs/stream/ActorPublisherDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/ActorPublisherDocSpec.scala @@ -8,7 +8,7 @@ import akka.actor.Props import akka.stream.ActorMaterializer import akka.stream.actor.ActorPublisher import akka.stream.scaladsl.{ Flow, Sink, Source } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec object ActorPublisherDocSpec { diff --git a/akka-docs/rst/scala/code/docs/stream/ActorSubscriberDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/ActorSubscriberDocSpec.scala index 3c9ea6ab4e..f8afb97266 100644 --- a/akka-docs/rst/scala/code/docs/stream/ActorSubscriberDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/ActorSubscriberDocSpec.scala @@ -15,7 +15,7 @@ import akka.stream.actor.ActorSubscriberMessage import akka.stream.actor.MaxInFlightRequestStrategy import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec object ActorSubscriberDocSpec { //#worker-pool diff --git a/akka-docs/rst/scala/code/docs/stream/BidiFlowDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/BidiFlowDocSpec.scala index 516d2173fb..d69e1ca39b 100644 --- a/akka-docs/rst/scala/code/docs/stream/BidiFlowDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/BidiFlowDocSpec.scala @@ -3,7 +3,7 @@ */ package docs.stream -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.scaladsl._ import akka.stream._ import akka.util.ByteString @@ -143,7 +143,7 @@ object BidiFlowDocSpec { }) } -class BidiFlowDocSpec extends AkkaSpec with ConversionCheckedTripleEquals { +class BidiFlowDocSpec extends AkkaSpec { import BidiFlowDocSpec._ implicit val materializer = ActorMaterializer() diff --git a/akka-docs/rst/scala/code/docs/stream/CompositionDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/CompositionDocSpec.scala index 82928ad506..645409110a 100644 --- a/akka-docs/rst/scala/code/docs/stream/CompositionDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/CompositionDocSpec.scala @@ -7,7 +7,7 @@ import akka.NotUsed import akka.stream._ import akka.stream.scaladsl.Tcp.OutgoingConnection import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.util.ByteString import scala.concurrent.{ Future, Promise } diff --git a/akka-docs/rst/scala/code/docs/stream/FlowDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/FlowDocSpec.scala index 7dc6f80476..fffc795a47 100644 --- a/akka-docs/rst/scala/code/docs/stream/FlowDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/FlowDocSpec.scala @@ -7,7 +7,7 @@ import akka.NotUsed import akka.actor.Cancellable import akka.stream.{ ClosedShape, FlowShape } import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.concurrent.{ Promise, Future } diff --git a/akka-docs/rst/scala/code/docs/stream/FlowErrorDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/FlowErrorDocSpec.scala index 089308af09..b2172b7ea0 100644 --- a/akka-docs/rst/scala/code/docs/stream/FlowErrorDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/FlowErrorDocSpec.scala @@ -8,7 +8,7 @@ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.Supervision import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.Attributes import akka.stream.ActorAttributes import scala.concurrent.duration._ diff --git a/akka-docs/rst/scala/code/docs/stream/FlowGraphDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/FlowGraphDocSpec.scala index c30ada3374..0b8398aa4d 100644 --- a/akka-docs/rst/scala/code/docs/stream/FlowGraphDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/FlowGraphDocSpec.scala @@ -6,7 +6,7 @@ package docs.stream import akka.NotUsed import akka.stream._ import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.collection.immutable import scala.concurrent.{ Future, Await } diff --git a/akka-docs/rst/scala/code/docs/stream/FlowParallelismDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/FlowParallelismDocSpec.scala index 5daaf76aac..1af724e372 100644 --- a/akka-docs/rst/scala/code/docs/stream/FlowParallelismDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/FlowParallelismDocSpec.scala @@ -3,7 +3,7 @@ package docs.stream import akka.NotUsed import akka.stream.FlowShape import akka.stream.scaladsl.{ GraphDSL, Merge, Balance, Source, Flow } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec class FlowParallelismDocSpec extends AkkaSpec { diff --git a/akka-docs/rst/scala/code/docs/stream/GraphCyclesSpec.scala b/akka-docs/rst/scala/code/docs/stream/GraphCyclesSpec.scala index a2961a8904..e99adf5a9d 100644 --- a/akka-docs/rst/scala/code/docs/stream/GraphCyclesSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/GraphCyclesSpec.scala @@ -2,7 +2,7 @@ package docs.stream import akka.stream.{ ClosedShape, OverflowStrategy, ActorMaterializer } import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec class GraphCyclesSpec extends AkkaSpec { diff --git a/akka-docs/rst/scala/code/docs/stream/GraphStageDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/GraphStageDocSpec.scala index 3bcc6f4b8d..bf2e92c0c6 100644 --- a/akka-docs/rst/scala/code/docs/stream/GraphStageDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/GraphStageDocSpec.scala @@ -8,8 +8,8 @@ import akka.stream.scaladsl.{ Keep, Sink, Flow, Source } import akka.stream.stage._ import akka.stream._ -import akka.stream.testkit.{ TestPublisher, TestSubscriber, AkkaSpec } -import akka.testkit.TestLatch +import akka.stream.testkit.{ TestPublisher, TestSubscriber } +import akka.testkit.{ AkkaSpec, TestLatch } import scala.collection.mutable import scala.concurrent.{ Promise, Await, Future } @@ -519,4 +519,4 @@ class GraphStageDocSpec extends AkkaSpec { sub.cancel() } -} \ No newline at end of file +} diff --git a/akka-docs/rst/scala/code/docs/stream/IntegrationDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/IntegrationDocSpec.scala index ae084d8f88..2d1fd35366 100644 --- a/akka-docs/rst/scala/code/docs/stream/IntegrationDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/IntegrationDocSpec.scala @@ -6,7 +6,7 @@ package docs.stream import akka.NotUsed import scala.concurrent.duration._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.scaladsl._ import akka.stream.ActorMaterializer import scala.concurrent.Future diff --git a/akka-docs/rst/scala/code/docs/stream/MigrationsScala.scala b/akka-docs/rst/scala/code/docs/stream/MigrationsScala.scala index f49df7eb09..b1201a9617 100644 --- a/akka-docs/rst/scala/code/docs/stream/MigrationsScala.scala +++ b/akka-docs/rst/scala/code/docs/stream/MigrationsScala.scala @@ -4,7 +4,7 @@ package docs.stream import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec class MigrationsScala extends AkkaSpec { diff --git a/akka-docs/rst/scala/code/docs/stream/RateTransformationDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/RateTransformationDocSpec.scala index c8ee0f9af0..fb019f13f2 100644 --- a/akka-docs/rst/scala/code/docs/stream/RateTransformationDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/RateTransformationDocSpec.scala @@ -12,7 +12,7 @@ import scala.math._ import scala.concurrent.Await import scala.concurrent.duration._ import scala.collection.immutable -import akka.testkit.TestLatch +import akka.testkit.{ AkkaSpec, TestLatch } class RateTransformationDocSpec extends AkkaSpec { diff --git a/akka-docs/rst/scala/code/docs/stream/ReactiveStreamsDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/ReactiveStreamsDocSpec.scala index 50564baa5e..84004cde12 100644 --- a/akka-docs/rst/scala/code/docs/stream/ReactiveStreamsDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/ReactiveStreamsDocSpec.scala @@ -8,6 +8,7 @@ import akka.stream.ActorMaterializer import akka.stream.scaladsl.{ Flow, Sink, Source } import akka.stream.testkit._ import org.reactivestreams.Processor +import akka.testkit.AkkaSpec class ReactiveStreamsDocSpec extends AkkaSpec { import TwitterStreamQuickstartDocSpec._ diff --git a/akka-docs/rst/scala/code/docs/stream/StreamBuffersRateSpec.scala b/akka-docs/rst/scala/code/docs/stream/StreamBuffersRateSpec.scala index 943e2cb8b0..af503e9c53 100644 --- a/akka-docs/rst/scala/code/docs/stream/StreamBuffersRateSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/StreamBuffersRateSpec.scala @@ -3,7 +3,7 @@ package docs.stream import akka.NotUsed import akka.stream._ import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec class StreamBuffersRateSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() diff --git a/akka-docs/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala index 591799421d..cff0bedff7 100644 --- a/akka-docs/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/StreamPartialFlowGraphDocSpec.scala @@ -6,7 +6,7 @@ package docs.stream import akka.actor.ActorRef import akka.stream._ import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ diff --git a/akka-docs/rst/scala/code/docs/stream/StreamTestKitDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/StreamTestKitDocSpec.scala index 52dfd4954d..65bee809e4 100644 --- a/akka-docs/rst/scala/code/docs/stream/StreamTestKitDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/StreamTestKitDocSpec.scala @@ -10,7 +10,7 @@ import akka.stream.testkit.scaladsl._ import scala.util._ import scala.concurrent.duration._ import scala.concurrent._ -import akka.testkit.TestProbe +import akka.testkit.{ AkkaSpec, TestProbe } import akka.pattern class StreamTestKitDocSpec extends AkkaSpec { diff --git a/akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala index c2b2b02397..388e161b8f 100644 --- a/akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala @@ -15,7 +15,7 @@ import scala.concurrent.Future //#imports -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec object TwitterStreamQuickstartDocSpec { //#model diff --git a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeSeq.scala b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeSeq.scala index c27235f0ac..caf402fed9 100644 --- a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeSeq.scala +++ b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeSeq.scala @@ -8,8 +8,7 @@ import scala.concurrent.Future import org.scalatest.concurrent.ScalaFutures import scala.concurrent.duration._ -class RecipeSeq extends RecipeSpec with ScalaFutures { - implicit val patience = PatienceConfig(3.seconds) +class RecipeSeq extends RecipeSpec { "Draining to a strict sequence" must { diff --git a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeSpec.scala b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeSpec.scala index aea78e5f18..0d54f24dc0 100644 --- a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeSpec.scala @@ -1,7 +1,7 @@ package docs.stream.cookbook import akka.stream.ActorMaterializer -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec trait RecipeSpec extends AkkaSpec { diff --git a/akka-docs/rst/scala/code/docs/stream/io/StreamFileDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/io/StreamFileDocSpec.scala index 3185cf345a..b66e58ed63 100644 --- a/akka-docs/rst/scala/code/docs/stream/io/StreamFileDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/io/StreamFileDocSpec.scala @@ -10,6 +10,7 @@ import akka.stream.scaladsl.{ FileIO, Sink, Source } import akka.stream.testkit.Utils._ import akka.stream.testkit._ import akka.util.ByteString +import akka.testkit.AkkaSpec import scala.concurrent.Future diff --git a/akka-docs/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala index 937094ea9a..790e2377dd 100644 --- a/akka-docs/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala @@ -8,7 +8,7 @@ import java.util.concurrent.atomic.AtomicReference import akka.stream._ import akka.stream.scaladsl.Tcp._ import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.testkit.TestProbe import akka.util.ByteString import docs.utils.TestUtils diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ClientCancellationSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ClientCancellationSpec.scala index a0dfb8cd61..839ecbc26d 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ClientCancellationSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ClientCancellationSpec.scala @@ -1,13 +1,13 @@ package akka.http.impl.engine.client import javax.net.ssl.SSLContext - import akka.http.scaladsl.{ ConnectionContext, Http } import akka.http.scaladsl.model.{ HttpResponse, HttpRequest } import akka.stream.ActorMaterializer import akka.stream.scaladsl.{ Flow, Sink, Source } -import akka.stream.testkit.{ TestSubscriber, TestPublisher, AkkaSpec, TestUtils, Utils } +import akka.stream.testkit.{ TestSubscriber, TestPublisher, TestUtils, Utils } import akka.http.scaladsl.model.headers +import akka.testkit.AkkaSpec class ClientCancellationSpec extends AkkaSpec(""" akka.loglevel = DEBUG diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala index 3114b15498..78423046de 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala @@ -9,7 +9,6 @@ import java.nio.ByteBuffer import java.nio.channels.{ SocketChannel, ServerSocketChannel } import java.util.concurrent.atomic.AtomicInteger import akka.http.impl.settings.ConnectionPoolSettingsImpl - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NonFatal @@ -20,10 +19,11 @@ import akka.http.impl.util.{ SingletonException, StreamUtils } import akka.http.scaladsl.settings.{ ClientConnectionSettings, ConnectionPoolSettings, ServerSettings } import akka.stream.{ ActorMaterializer } import akka.stream.TLSProtocol._ -import akka.stream.testkit.{ TestPublisher, TestSubscriber, AkkaSpec } +import akka.stream.testkit.{ TestPublisher, TestSubscriber } import akka.stream.scaladsl._ import akka.http.scaladsl.model.headers._ import akka.http.scaladsl.model._ +import akka.testkit.AkkaSpec class ConnectionPoolSpec extends AkkaSpec(""" akka.loggers = [] diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/HighLevelOutgoingConnectionSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/HighLevelOutgoingConnectionSpec.scala index a81ad75ab1..8ecfdd85cb 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/HighLevelOutgoingConnectionSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/HighLevelOutgoingConnectionSpec.scala @@ -10,15 +10,14 @@ import scala.concurrent.Await import scala.concurrent.duration._ import akka.stream.{ ActorMaterializerSettings, FlowShape, ActorMaterializer } import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.http.scaladsl.{ Http, TestUtils } import akka.http.scaladsl.model._ import akka.stream.testkit.Utils import org.scalatest.concurrent.ScalaFutures -class HighLevelOutgoingConnectionSpec extends AkkaSpec with ScalaFutures { +class HighLevelOutgoingConnectionSpec extends AkkaSpec { implicit val materializer = ActorMaterializer(ActorMaterializerSettings(system).withFuzzing(true)) - implicit val patience = PatienceConfig(1.second) "The connection-level client implementation" should { diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/HttpConfigurationSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/HttpConfigurationSpec.scala index c54e7873a0..8371a4c8ab 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/HttpConfigurationSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/HttpConfigurationSpec.scala @@ -6,7 +6,7 @@ package akka.http.impl.engine.client import akka.actor.ActorSystem import akka.http.scaladsl.settings.{ ClientConnectionSettings, ConnectionPoolSettings, ServerSettings } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import com.typesafe.config.ConfigFactory class HttpConfigurationSpec extends AkkaSpec { diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/LowLevelOutgoingConnectionSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/LowLevelOutgoingConnectionSpec.scala index 1c7ed51dd6..b9019c367c 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/LowLevelOutgoingConnectionSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/LowLevelOutgoingConnectionSpec.scala @@ -11,7 +11,7 @@ import org.scalatest.concurrent.ScalaFutures import akka.http.scaladsl.settings.ClientConnectionSettings import akka.util.ByteString import akka.event.NoLogging -import akka.stream.{ClosedShape, ActorMaterializer} +import akka.stream.{ ClosedShape, ActorMaterializer } import akka.stream.TLSProtocol._ import akka.stream.testkit._ import akka.stream.scaladsl._ @@ -20,6 +20,7 @@ import akka.http.scaladsl.model.HttpMethods._ import akka.http.scaladsl.model._ import akka.http.scaladsl.model.headers._ import akka.http.impl.util._ +import akka.testkit.AkkaSpec class LowLevelOutgoingConnectionSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF") with Inside { implicit val materializer = ActorMaterializer() @@ -179,7 +180,7 @@ class LowLevelOutgoingConnectionSpec extends AkkaSpec("akka.loggers = []\n akka. } } - "proceed to next response once previous response's entity has been drained" in new TestSetup with ScalaFutures { + "proceed to next response once previous response's entity has been drained" in new TestSetup { def twice(action: => Unit): Unit = { action; action } twice { @@ -203,11 +204,10 @@ class LowLevelOutgoingConnectionSpec extends AkkaSpec("akka.loggers = []\n akka. |""") val whenComplete = expectResponse().entity.dataBytes.runWith(Sink.ignore) - whenComplete.futureValue should be (akka.Done) + whenComplete.futureValue should be(akka.Done) } } - "handle several requests on one persistent connection" which { "has a first response that was chunked" in new TestSetup { requestsSub.sendNext(HttpRequest()) diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/PrepareResponseSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/PrepareResponseSpec.scala index b3626191a6..b373820064 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/PrepareResponseSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/PrepareResponseSpec.scala @@ -10,8 +10,9 @@ import akka.http.scaladsl.model._ import akka.http.scaladsl.settings.ParserSettings import akka.stream.{ ActorMaterializer, Attributes } import akka.stream.scaladsl.{ Sink, Source } -import akka.stream.testkit.{ TestSubscriber, TestPublisher, AkkaSpec } +import akka.stream.testkit.{ TestSubscriber, TestPublisher } import akka.util.ByteString +import akka.testkit.AkkaSpec class PrepareResponseSpec extends AkkaSpec { diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/TlsEndpointVerificationSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/TlsEndpointVerificationSpec.scala index 1b0492e113..f7ce292145 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/TlsEndpointVerificationSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/TlsEndpointVerificationSpec.scala @@ -9,7 +9,7 @@ import org.scalatest.concurrent.PatienceConfiguration.Timeout import org.scalatest.concurrent.ScalaFutures import akka.stream.{ Server, Client, ActorMaterializer } import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.http.impl.util._ import akka.http.scaladsl.{ ConnectionContext, Http } import akka.http.scaladsl.model.{ StatusCodes, HttpResponse, HttpRequest } @@ -21,7 +21,7 @@ class TlsEndpointVerificationSpec extends AkkaSpec(""" akka.loglevel = INFO akka.io.tcp.trace-logging = off akka.http.parsing.tls-session-info-header = on - """) with ScalaFutures { + """) { implicit val materializer = ActorMaterializer() /* @@ -30,7 +30,6 @@ class TlsEndpointVerificationSpec extends AkkaSpec(""" val includeTestsHittingActualWebsites = false val timeout = Timeout(Span(3, Seconds)) - implicit val patience = PatienceConfig(Span(10, Seconds)) "The client implementation" should { "not accept certificates signed by unknown CA" in { diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerSpec.scala index 364febbdec..f3cb1224f4 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerSpec.scala @@ -22,6 +22,7 @@ import headers._ import HttpEntity._ import MediaTypes._ import HttpMethods._ +import akka.testkit.AkkaSpec class HttpServerSpec extends AkkaSpec( """akka.loggers = [] @@ -354,7 +355,7 @@ class HttpServerSpec extends AkkaSpec( } } - "proceed to next request once previous request's entity has beed drained" in new TestSetup with ScalaFutures { + "proceed to next request once previous request's entity has beed drained" in new TestSetup { def twice(action: => Unit): Unit = { action; action } twice { @@ -369,7 +370,7 @@ class HttpServerSpec extends AkkaSpec( |""") val whenComplete = expectRequest().entity.dataBytes.runWith(Sink.ignore) - whenComplete.futureValue should be (akka.Done) + whenComplete.futureValue should be(akka.Done) } } diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketIntegrationSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketIntegrationSpec.scala index e0805bd22a..0b60a94492 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketIntegrationSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketIntegrationSpec.scala @@ -21,12 +21,11 @@ import java.net.InetSocketAddress import akka.stream.impl.fusing.GraphStages import akka.util.ByteString import akka.stream.testkit.scaladsl.TestSink -import akka.testkit.EventFilter +import akka.testkit.{ AkkaSpec, EventFilter } class WebSocketIntegrationSpec extends AkkaSpec("akka.stream.materializer.debug.fuzzing-mode=off") - with ScalaFutures with ConversionCheckedTripleEquals with Eventually { + with Eventually { - implicit val patience = PatienceConfig(3.seconds) implicit val materializer = ActorMaterializer() "A WebSocket server" must { diff --git a/akka-http-core/src/test/scala/akka/http/impl/util/One2OneBidiFlowSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/util/One2OneBidiFlowSpec.scala index 673eafc633..64a60f33a0 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/util/One2OneBidiFlowSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/util/One2OneBidiFlowSpec.scala @@ -4,18 +4,17 @@ package akka.http.impl.util import java.util.concurrent.atomic.AtomicInteger - import akka.NotUsed import akka.stream.ActorMaterializer import akka.stream.scaladsl.{ Flow, Keep, Sink, Source } import akka.stream.testkit.Utils._ -import akka.stream.testkit.{ AkkaSpec, _ } +import akka.stream.testkit._ import org.scalactic.ConversionCheckedTripleEquals - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.testkit.AkkaSpec -class One2OneBidiFlowSpec extends AkkaSpec with ConversionCheckedTripleEquals { +class One2OneBidiFlowSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() "A One2OneBidiFlow" must { diff --git a/akka-http-core/src/test/scala/akka/http/javadsl/ConnectHttpSpec.scala b/akka-http-core/src/test/scala/akka/http/javadsl/ConnectHttpSpec.scala index 4b675da0bb..25ef03e272 100644 --- a/akka-http-core/src/test/scala/akka/http/javadsl/ConnectHttpSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/javadsl/ConnectHttpSpec.scala @@ -7,7 +7,7 @@ import akka.http.javadsl.model._ import org.scalatest.concurrent.ScalaFutures import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpec } -class ConnectHttpSpec extends WordSpec with Matchers with BeforeAndAfterAll with ScalaFutures { +class ConnectHttpSpec extends WordSpec with Matchers with BeforeAndAfterAll { val httpContext = ConnectionContext.noEncryption() val httpsContext = ConnectionContext.https(null) @@ -72,4 +72,4 @@ class ConnectHttpSpec extends WordSpec with Matchers with BeforeAndAfterAll with ex.getMessage should include("non https scheme!") } } -} \ No newline at end of file +} diff --git a/akka-http-core/src/test/scala/akka/http/javadsl/HttpExtensionApiSpec.scala b/akka-http-core/src/test/scala/akka/http/javadsl/HttpExtensionApiSpec.scala index 8376ed3840..c0be925dc4 100644 --- a/akka-http-core/src/test/scala/akka/http/javadsl/HttpExtensionApiSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/javadsl/HttpExtensionApiSpec.scala @@ -25,7 +25,7 @@ import org.scalatest.{ WordSpec, Matchers, BeforeAndAfterAll } import org.scalatest.concurrent.ScalaFutures import scala.util.Try -class HttpExtensionApiSpec extends WordSpec with Matchers with BeforeAndAfterAll with ScalaFutures { +class HttpExtensionApiSpec extends WordSpec with Matchers with BeforeAndAfterAll { // tries to cover all surface area of javadsl.Http diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/FormDataSpec.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/FormDataSpec.scala index 9c20df6557..83fbb746f4 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/FormDataSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/FormDataSpec.scala @@ -5,7 +5,6 @@ package akka.http.scaladsl import scala.concurrent.duration._ -import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpec } import org.scalatest.concurrent.ScalaFutures import akka.actor.ActorSystem import akka.stream.ActorMaterializer @@ -13,16 +12,14 @@ import akka.http.scaladsl.unmarshalling.Unmarshal import akka.http.scaladsl.marshalling.Marshal import akka.http.scaladsl.model._ import scala.concurrent.Await +import akka.testkit.AkkaSpec -class FormDataSpec extends WordSpec with Matchers with ScalaFutures with BeforeAndAfterAll { - implicit val system = ActorSystem(getClass.getSimpleName) +class FormDataSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() import system.dispatcher val formData = FormData(Map("surname" -> "Smith", "age" -> "42")) - implicit val patience = PatienceConfig(3.seconds) - "The FormData infrastructure" should { "properly round-trip the fields of www-urlencoded forms" in { Marshal(formData).to[HttpEntity] @@ -38,7 +35,4 @@ class FormDataSpec extends WordSpec with Matchers with ScalaFutures with BeforeA } } - override def afterAll() = { - Await.result(system.terminate(), 10.seconds) - } } diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/AkkaSpec.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/AkkaSpec.scala deleted file mode 100644 index 2426b80b1c..0000000000 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/AkkaSpec.scala +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2009-2016 Lightbend Inc. - */ - -package akka.stream.testkit - -import akka.testkit.TestKit -import akka.event.LoggingAdapter -import scala.concurrent.duration.FiniteDuration -import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfterAll -import akka.dispatch.Dispatchers -import akka.actor.ActorSystem -import org.scalatest.Matchers -import com.typesafe.config.Config -import akka.event.Logging -import scala.concurrent.Future -import org.scalatest.WordSpecLike -import akka.testkit.TestEvent.Mute -import akka.testkit.DeadLettersFilter -import scala.concurrent.duration._ - -object AkkaSpec { // FIXME: remove once going back to project dependencies - val testConf: Config = ConfigFactory.parseString(""" - akka { - loglevel = "WARNING" - stdout-loglevel = "WARNING" - actor { - default-dispatcher { - executor = "fork-join-executor" - fork-join-executor { - parallelism-min = 8 - parallelism-factor = 2.0 - parallelism-max = 8 - } - } - } - } - """) - - def mapToConfig(map: Map[String, Any]): Config = { - import scala.collection.JavaConverters._ - ConfigFactory.parseMap(map.asJava) - } - - def getCallerName(clazz: Class[_]): String = { - val s = (Thread.currentThread.getStackTrace map (_.getClassName) drop 1) - .dropWhile(_ matches "(java.lang.Thread|.*AkkaSpec.?$)") - val reduced = s.lastIndexWhere(_ == clazz.getName) match { - case -1 ⇒ s - case z ⇒ s drop (z + 1) - } - reduced.head.replaceFirst(""".*\.""", "").replaceAll("[^a-zA-Z_0-9]", "_") - } - -} - -abstract class AkkaSpec(_system: ActorSystem) - extends TestKit(_system) with WordSpecLike with Matchers with BeforeAndAfterAll with WatchedByCoroner { - - def this(config: Config) = this(ActorSystem(AkkaSpec.getCallerName(getClass), - ConfigFactory.load(config.withFallback(AkkaSpec.testConf)))) - - def this(s: String) = this(ConfigFactory.parseString(s)) - - def this(configMap: Map[String, _]) = this(AkkaSpec.mapToConfig(configMap)) - - def this() = this(ActorSystem(AkkaSpec.getCallerName(getClass), AkkaSpec.testConf)) - - val log: LoggingAdapter = Logging(system, this.getClass) - - override val invokeBeforeAllAndAfterAllEvenIfNoTestsAreExpected = true - - final override def beforeAll { - startCoroner - atStartup() - } - - final override def afterAll { - beforeTermination() - shutdown() - afterTermination() - stopCoroner() - } - - protected def atStartup() {} - - protected def beforeTermination() {} - - protected def afterTermination() {} - - def spawn(dispatcherId: String = Dispatchers.DefaultDispatcherId)(body: ⇒ Unit): Unit = - Future(body)(system.dispatchers.lookup(dispatcherId)) - - override def expectedTestDuration: FiniteDuration = 60.seconds - - def muteDeadLetters(messageClasses: Class[_]*)(sys: ActorSystem = system): Unit = - if (!sys.log.isDebugEnabled) { - def mute(clazz: Class[_]): Unit = - sys.eventStream.publish(Mute(DeadLettersFilter(clazz)(occurrences = Int.MaxValue))) - if (messageClasses.isEmpty) mute(classOf[AnyRef]) - else messageClasses foreach mute - } - -} diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala index 07d5aef914..53b3a6e44d 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala @@ -9,6 +9,7 @@ import org.reactivestreams.Publisher import scala.collection.immutable import scala.util.control.NoStackTrace import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec abstract class BaseTwoStreamsSetup extends AkkaSpec { diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala index 7f30c83bb9..11320644a4 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala @@ -6,8 +6,8 @@ package akka.stream.testkit import akka.stream._ import akka.stream.scaladsl.Source import akka.stream.testkit.scaladsl.TestSink - import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class StreamTestKitSpec extends AkkaSpec { diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TestPublisherSubscriberSpec.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TestPublisherSubscriberSpec.scala index a53f450920..96664a8cca 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TestPublisherSubscriberSpec.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TestPublisherSubscriberSpec.scala @@ -9,6 +9,7 @@ import akka.stream.testkit.TestSubscriber._ import akka.stream.testkit.Utils._ import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import org.reactivestreams.Subscription +import akka.testkit.AkkaSpec class TestPublisherSubscriberSpec extends AkkaSpec { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorSystemLifecycle.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorSystemLifecycle.scala index 4f2065d60f..5f49a63a53 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorSystemLifecycle.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorSystemLifecycle.scala @@ -8,7 +8,7 @@ import scala.concurrent.duration._ import akka.actor.ActorSystem import akka.actor.ActorSystemImpl import org.testng.annotations.AfterClass -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.event.Logging import akka.testkit.TestEvent import akka.testkit.EventFilter diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala index e72fdd1133..265b693af6 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala @@ -4,7 +4,6 @@ package akka.stream.tck import java.io.{ File, FileWriter } - import akka.actor.ActorSystem import akka.event.Logging import akka.stream.scaladsl.FileIO @@ -15,6 +14,7 @@ import akka.testkit.{ EventFilter, TestEvent } import akka.util.ByteString import org.reactivestreams.Publisher import org.testng.annotations.{ AfterClass, BeforeClass } +import akka.testkit.AkkaSpec class FilePublisherTest extends AkkaPublisherVerification[ByteString] { diff --git a/akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java b/akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java index e59f4eb1bc..f9d24493de 100644 --- a/akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java @@ -5,7 +5,7 @@ import akka.actor.Props; import akka.stream.StreamTest; import akka.stream.javadsl.AkkaJUnitActorSystemResource; import akka.stream.javadsl.Source; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.testkit.JavaTestKit; import org.junit.ClassRule; import org.junit.Test; diff --git a/akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java b/akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java index 9e8b875888..03b034c525 100644 --- a/akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java @@ -6,7 +6,7 @@ import akka.stream.StreamTest; import akka.stream.javadsl.AkkaJUnitActorSystemResource; import akka.stream.javadsl.Sink; import akka.stream.javadsl.Source; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.testkit.JavaTestKit; import org.junit.ClassRule; import org.junit.Test; diff --git a/akka-stream-tests/src/test/java/akka/stream/io/InputStreamSinkTest.java b/akka-stream-tests/src/test/java/akka/stream/io/InputStreamSinkTest.java index b36c0e7007..96f5d0845c 100644 --- a/akka-stream-tests/src/test/java/akka/stream/io/InputStreamSinkTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/io/InputStreamSinkTest.java @@ -9,7 +9,7 @@ import akka.stream.javadsl.AkkaJUnitActorSystemResource; import akka.stream.javadsl.Sink; import akka.stream.javadsl.Source; import akka.stream.javadsl.StreamConverters; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.stream.testkit.Utils; import akka.util.ByteString; import org.junit.ClassRule; diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/AkkaJUnitActorSystemResource.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/AkkaJUnitActorSystemResource.java index 2873e6ae8f..057b341381 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/AkkaJUnitActorSystemResource.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/AkkaJUnitActorSystemResource.java @@ -6,7 +6,7 @@ package akka.stream.javadsl; import org.junit.rules.ExternalResource; import akka.actor.ActorSystem; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.testkit.JavaTestKit; import com.typesafe.config.Config; diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/AttributesTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/AttributesTest.java index 2d2e9e1a19..fba31ef0e6 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/AttributesTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/AttributesTest.java @@ -14,7 +14,7 @@ import org.junit.Test; import akka.stream.Attributes; import akka.stream.StreamTest; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; public class AttributesTest extends StreamTest { diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/BidiFlowTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/BidiFlowTest.java index 5abaa55094..1c50f2422a 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/BidiFlowTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/BidiFlowTest.java @@ -19,7 +19,7 @@ import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; import akka.japi.Pair; import akka.stream.*; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.stream.javadsl.GraphDSL.Builder; import akka.japi.function.*; import akka.util.ByteString; diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowGraphTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowGraphTest.java index c4bc397540..4373ccf093 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowGraphTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowGraphTest.java @@ -11,7 +11,7 @@ import akka.stream.*; import akka.stream.javadsl.GraphDSL.Builder; import akka.stream.stage.*; import akka.japi.function.*; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.testkit.JavaTestKit; import akka.testkit.TestProbe; diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java index 9f56a0eae3..9372320bc6 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java @@ -15,7 +15,7 @@ import akka.stream.*; import akka.stream.impl.ConstantFun; import akka.stream.javadsl.GraphDSL.Builder; import akka.stream.stage.*; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.stream.testkit.TestPublisher; import akka.testkit.JavaTestKit; import org.junit.ClassRule; diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/FramingTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/FramingTest.java index 861bd42b77..60ca3956eb 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/FramingTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/FramingTest.java @@ -5,7 +5,7 @@ package akka.stream.javadsl; import akka.NotUsed; import akka.stream.StreamTest; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.util.ByteString; import org.junit.ClassRule; import org.junit.Test; diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/SinkTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/SinkTest.java index 02d5c27f3f..913317f345 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/SinkTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/SinkTest.java @@ -21,7 +21,7 @@ import scala.concurrent.Await; import scala.concurrent.Future; import scala.concurrent.duration.Duration; import akka.japi.function.Function2; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.testkit.JavaTestKit; import static org.junit.Assert.*; diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java index 79c2bec3ef..af02af9684 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/SourceTest.java @@ -17,7 +17,7 @@ import akka.japi.pf.PFBuilder; import akka.stream.*; import akka.stream.impl.ConstantFun; import akka.stream.stage.*; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.stream.testkit.TestPublisher; import akka.testkit.JavaTestKit; import org.junit.ClassRule; diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/TcpTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/TcpTest.java index f7fe216eb0..524e95c18c 100644 --- a/akka-stream-tests/src/test/java/akka/stream/javadsl/TcpTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/TcpTest.java @@ -25,7 +25,7 @@ import scala.runtime.BoxedUnit; import akka.stream.*; import akka.stream.javadsl.Tcp.*; import akka.japi.function.*; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import akka.stream.testkit.TestUtils; import akka.util.ByteString; import akka.testkit.JavaTestKit; diff --git a/akka-stream-tests/src/test/java/akka/stream/stage/StageTest.java b/akka-stream-tests/src/test/java/akka/stream/stage/StageTest.java index ccc3a2f550..ee5985325c 100644 --- a/akka-stream-tests/src/test/java/akka/stream/stage/StageTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/stage/StageTest.java @@ -8,7 +8,7 @@ import akka.stream.StreamTest; import akka.stream.javadsl.AkkaJUnitActorSystemResource; import akka.stream.javadsl.Sink; import akka.stream.javadsl.Source; -import akka.stream.testkit.AkkaSpec; +import akka.testkit.AkkaSpec; import org.junit.ClassRule; import org.junit.Ignore; diff --git a/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala index 648f169477..97a0479b80 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala @@ -3,8 +3,7 @@ package akka.stream import akka.actor.{ ActorSystem, Props } import akka.stream.impl.{ StreamSupervisor, ActorMaterializerImpl } import akka.stream.scaladsl.{ Sink, Source } -import akka.stream.testkit.AkkaSpec -import akka.testkit.{ TestActor, ImplicitSender } +import akka.testkit.{ AkkaSpec, TestActor, ImplicitSender } import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/FusingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FusingSpec.scala index 6afd6120e2..7553abe07c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/FusingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/FusingSpec.scala @@ -4,7 +4,7 @@ package akka.stream import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import org.scalactic.ConversionCheckedTripleEquals import akka.stream.Attributes._ import akka.stream.Fusing.FusedGraph @@ -15,11 +15,10 @@ import scala.concurrent.duration._ import akka.stream.impl.fusing.GraphInterpreter import akka.event.BusLogging -class FusingSpec extends AkkaSpec with ScalaFutures with ConversionCheckedTripleEquals { +class FusingSpec extends AkkaSpec { final val Debug = false implicit val materializer = ActorMaterializer() - implicit val patience = PatienceConfig(1.second) def graph(async: Boolean) = Source.unfold(1)(x ⇒ Some(x -> x)).filter(_ % 2 == 1) diff --git a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala index 1d7dd815b8..e760a7ac33 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala @@ -9,7 +9,7 @@ import akka.stream.scaladsl._ import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.testkit.TestEvent.Mute -import akka.testkit.{ EventFilter, ImplicitSender, TestProbe } +import akka.testkit.{ AkkaSpec, EventFilter, ImplicitSender, TestProbe } import scala.annotation.tailrec import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala index 50408b6911..2df319d326 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala @@ -7,7 +7,7 @@ import akka.actor.{ Actor, ActorRef, Props } import akka.routing.{ ActorRefRoutee, RoundRobinRoutingLogic, Router } import akka.stream.ActorMaterializer import akka.stream.scaladsl.{ Sink, Source } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import org.reactivestreams.Subscription diff --git a/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala index a2b7a1a88a..e3d3d61041 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala @@ -10,6 +10,7 @@ import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.testkit.TestProbe import org.reactivestreams.{ Publisher, Subscriber } +import akka.testkit.AkkaSpec class FlowTimedSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala index 3245ac62bf..c416fce143 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala @@ -3,7 +3,7 @@ */ package akka.stream.impl -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.ActorMaterializerSettings class FixedBufferSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala index 66c22f124b..0071db3cbc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala @@ -4,7 +4,7 @@ package akka.stream.impl import akka.stream.stage.GraphStageLogic.{ EagerTerminateOutput, EagerTerminateInput } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream._ import akka.stream.Fusing.aggressive import akka.stream.scaladsl._ @@ -16,7 +16,7 @@ import org.scalactic.ConversionCheckedTripleEquals import org.scalatest.concurrent.ScalaFutures import scala.concurrent.duration.Duration -class GraphStageLogicSpec extends AkkaSpec with GraphInterpreterSpecKit with ConversionCheckedTripleEquals with ScalaFutures { +class GraphStageLogicSpec extends AkkaSpec with GraphInterpreterSpecKit { implicit val materializer = ActorMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/StreamLayoutSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/StreamLayoutSpec.scala index be3b0fcbf0..d174b2e145 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/StreamLayoutSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/StreamLayoutSpec.scala @@ -4,7 +4,7 @@ package akka.stream.impl import akka.stream.scaladsl._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import org.reactivestreams.{ Subscription, Subscriber, Publisher } import akka.stream._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala index 50714cf181..3b7b6b20a5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala @@ -5,15 +5,14 @@ package akka.stream.impl import java.util.concurrent.TimeoutException - import akka.Done import akka.stream.scaladsl._ import akka.stream.testkit.Utils._ -import akka.stream.testkit.{ AkkaSpec, TestPublisher, TestSubscriber } +import akka.stream.testkit.{ TestPublisher, TestSubscriber } import akka.stream.{ ActorMaterializer, ClosedShape } - import scala.concurrent.duration._ import scala.concurrent.{ Await, Future } +import akka.testkit.AkkaSpec class TimeoutsSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala index 1f2d67d838..0f8a70f11d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala @@ -4,16 +4,15 @@ package akka.stream.impl.fusing import java.util.concurrent.CountDownLatch - import akka.stream._ import akka.stream.scaladsl._ import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler } import akka.stream.testkit.Utils._ -import akka.stream.testkit.{ AkkaSpec, TestPublisher, TestSubscriber } +import akka.stream.testkit.{ TestPublisher, TestSubscriber } import akka.testkit.EventFilter - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class ActorGraphInterpreterSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterFailureModesSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterFailureModesSpec.scala index 7f46c03e98..897aa96499 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterFailureModesSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterFailureModesSpec.scala @@ -2,7 +2,7 @@ package akka.stream.impl.fusing import akka.stream.testkit.Utils.TE import akka.testkit.EventFilter -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec class GraphInterpreterFailureModesSpec extends AkkaSpec with GraphInterpreterSpecKit { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterPortsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterPortsSpec.scala index 6276f6e28b..c4b561025c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterPortsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterPortsSpec.scala @@ -3,7 +3,7 @@ */ package akka.stream.impl.fusing -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.Utils._ class GraphInterpreterPortsSpec extends AkkaSpec with GraphInterpreterSpecKit { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpec.scala index 0028962a82..e795e75374 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpec.scala @@ -6,7 +6,7 @@ package akka.stream.impl.fusing import akka.NotUsed import akka.stream.{ OverflowStrategy, Attributes } import akka.stream.stage.AbstractStage.PushPullGraphStage -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.scaladsl.{ Merge, Broadcast, Balance, Zip } import GraphInterpreter._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala index ffef9de826..a544e62656 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala @@ -8,7 +8,7 @@ import akka.stream._ import akka.stream.impl.fusing.GraphInterpreter.{ DownstreamBoundaryStageLogic, Failed, GraphAssembly, UpstreamBoundaryStageLogic } import akka.stream.stage.AbstractStage.PushPullGraphStage import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler, _ } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.Utils.TE import akka.stream.impl.fusing.GraphInterpreter.GraphAssembly diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala index e49ec9cf39..e2b535c812 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala @@ -5,7 +5,7 @@ package akka.stream.impl.fusing import akka.stream.impl.ConstantFun import akka.stream.stage._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.testkit.EventFilter import akka.stream.Supervision diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala index 5f9bb08b4d..930bf4d92f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala @@ -4,8 +4,8 @@ package akka.stream.impl.fusing import akka.stream.impl.ConstantFun -import akka.stream.{ Supervision } -import akka.stream.testkit.AkkaSpec +import akka.stream.Supervision +import akka.testkit.AkkaSpec class InterpreterStressSpec extends AkkaSpec with GraphInterpreterSpecKit { import Supervision.stoppingDecider diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala index 4f80afce0e..7785010014 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala @@ -10,7 +10,7 @@ import akka.stream.stage.PushPullStage import akka.stream.stage.Stage import akka.stream.stage.TerminationDirective import akka.stream.stage.SyncDirective -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec object InterpreterSupervisionSpec { val TE = new Exception("TEST") with NoStackTrace { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/IteratorInterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/IteratorInterpreterSpec.scala index c3a2e46d13..6fccb27488 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/IteratorInterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/IteratorInterpreterSpec.scala @@ -3,7 +3,7 @@ */ package akka.stream.impl.fusing -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.util.ByteString import akka.stream.stage._ import akka.stream.Supervision diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala index a503afe39d..6fb69c67b8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala @@ -7,7 +7,7 @@ import akka.actor.{ NoSerializationVerificationNeeded, ActorRef } import akka.stream.scaladsl.{ Keep, Source } import akka.stream.{ Attributes, Inlet, SinkShape, ActorMaterializer } import akka.stream.stage.{ InHandler, AsyncCallback, GraphStageLogic, GraphStageWithMaterializedValue } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.Utils._ import scala.concurrent.{ Await, Promise, Future } diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/LifecycleInterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/LifecycleInterpreterSpec.scala index 6ce5095705..84129085e9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/LifecycleInterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/LifecycleInterpreterSpec.scala @@ -4,7 +4,7 @@ package akka.stream.impl.fusing import akka.stream.stage._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.Utils.TE import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala index f6bfd6da55..3b4a200416 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala @@ -5,7 +5,6 @@ package akka.stream.io import java.io.File import java.nio.file.StandardOpenOption - import akka.actor.ActorSystem import akka.stream.impl.ActorMaterializerImpl import akka.stream.impl.StreamSupervisor @@ -18,10 +17,10 @@ import akka.stream.ActorMaterializerSettings import akka.stream.ActorAttributes import akka.util.ByteString import akka.util.Timeout - import scala.collection.mutable.ListBuffer import scala.concurrent.Await import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class FileSinkSpec extends AkkaSpec(UnboundedMailboxConfig) { @@ -155,4 +154,3 @@ class FileSinkSpec extends AkkaSpec(UnboundedMailboxConfig) { } } - diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala index ec45a7e07c..afa51bef4a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala @@ -6,7 +6,6 @@ package akka.stream.io import java.io.File import java.io.FileWriter import java.util.Random - import akka.actor.ActorSystem import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings @@ -22,9 +21,9 @@ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.TestSink import akka.util.ByteString import akka.util.Timeout - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.testkit.AkkaSpec object FileSourceSpec { final case class Settings(chunkSize: Int, readAhead: Int) diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala index 34971c3466..1f571facec 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala @@ -5,7 +5,6 @@ package akka.stream.io import java.io.{ IOException, InputStream } import java.util.concurrent.TimeoutException - import akka.actor.ActorSystem import akka.stream._ import akka.stream.Attributes.inputBuffer @@ -15,14 +14,14 @@ import akka.stream.impl.{ ActorMaterializerImpl, StreamSupervisor } import akka.stream.scaladsl.{ Keep, Source, StreamConverters } import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.TestSource -import akka.stream.testkit.{ AkkaSpec, GraphStageMessages, TestSinkStage } +import akka.stream.testkit.{ GraphStageMessages, TestSinkStage } import akka.testkit.TestProbe import akka.util.ByteString - import scala.concurrent.duration._ import scala.concurrent.forkjoin.ThreadLocalRandom import scala.concurrent.{ Await, Future } import scala.util.control.NoStackTrace +import akka.testkit.AkkaSpec class InputStreamSinkSpec extends AkkaSpec(UnboundedMailboxConfig) { import system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala index 24f1c15c8f..6049a69fbe 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala @@ -12,11 +12,12 @@ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.util.ByteString +import akka.testkit.AkkaSpec import org.scalatest.concurrent.ScalaFutures import scala.concurrent.Await import scala.concurrent.duration._ -class InputStreamSourceSpec extends AkkaSpec(UnboundedMailboxConfig) with ScalaFutures { +class InputStreamSourceSpec extends AkkaSpec(UnboundedMailboxConfig) { val settings = ActorMaterializerSettings(system).withDispatcher("akka.actor.default-dispatcher") implicit val materializer = ActorMaterializer(settings) diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala index d05aec423a..9b202e63dc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala @@ -9,7 +9,7 @@ import akka.stream.scaladsl.{ Source, StreamConverters } import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } -import akka.testkit.TestProbe +import akka.testkit.{ AkkaSpec, TestProbe } import akka.util.ByteString import scala.concurrent.Await diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala index 457bd89d90..3d9bf9e24e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala @@ -5,7 +5,6 @@ package akka.stream.io import java.io.IOException import java.util.concurrent.TimeoutException - import akka.actor.ActorSystem import akka.stream._ import akka.stream.Attributes.inputBuffer @@ -18,11 +17,11 @@ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.TestProbe import akka.util.ByteString - import scala.concurrent.duration.Duration.Zero import scala.concurrent.duration._ import scala.concurrent.{ Await, Future } import scala.util.Random +import akka.testkit.AkkaSpec class OutputStreamSourceSpec extends AkkaSpec(UnboundedMailboxConfig) { import system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala index 0a6151d8dd..47f793d3ee 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala @@ -19,6 +19,7 @@ import scala.concurrent.{ Promise, Await } import scala.concurrent.duration._ import java.net.BindException import akka.testkit.EventFilter +import akka.testkit.AkkaSpec class TcpSpec extends AkkaSpec("akka.stream.materializer.subscription-timeout.timeout = 2s") with TcpHelper { var demand = 0L diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala index 7292dafde1..73b77af77d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala @@ -20,7 +20,7 @@ import akka.stream.scaladsl._ import akka.stream.stage._ import akka.stream.testkit._ import akka.stream.testkit.Utils._ -import akka.testkit.EventFilter +import akka.testkit.{ AkkaSpec, EventFilter } import akka.util.ByteString import javax.net.ssl._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala index bd05d75ac1..2f52804bc1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala @@ -12,6 +12,7 @@ import akka.stream.testkit.scaladsl._ import org.scalatest.concurrent.ScalaFutures import org.scalactic.ConversionCheckedTripleEquals import scala.concurrent.duration._ +import akka.testkit.AkkaSpec object ActorRefBackpressureSinkSpec { val initMessage = "start" @@ -47,10 +48,9 @@ object ActorRefBackpressureSinkSpec { } -class ActorRefBackpressureSinkSpec extends AkkaSpec with ScalaFutures with ConversionCheckedTripleEquals { +class ActorRefBackpressureSinkSpec extends AkkaSpec { import ActorRefBackpressureSinkSpec._ implicit val mat = ActorMaterializer() - implicit val patience = PatienceConfig(2.second) def createActor[T](c: Class[T]) = system.actorOf(Props(c, testActor).withDispatcher("akka.test.stream-dispatcher")) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala index 9d4fa57dda..759e1b758a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala @@ -10,6 +10,7 @@ import akka.stream.testkit.scaladsl._ import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Props +import akka.testkit.AkkaSpec object ActorRefSinkSpec { case class Fw(ref: ActorRef) extends Actor { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala index a7e56b5308..91572838a8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala @@ -10,6 +10,7 @@ import akka.stream.testkit.scaladsl._ import akka.stream.testkit.Utils._ import akka.actor.PoisonPill import akka.actor.Status +import akka.testkit.AkkaSpec class ActorRefSourceSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AttributesSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AttributesSpec.scala index 0d24e900d4..262fa5825d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AttributesSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AttributesSpec.scala @@ -16,6 +16,7 @@ import akka.stream.impl.SinkModule import akka.stream.impl.StreamLayout.Module import org.scalatest.concurrent.ScalaFutures import akka.stream.impl.SinkholeSubscriber +import akka.testkit.AkkaSpec object AttributesSpec { @@ -37,7 +38,7 @@ object AttributesSpec { } -class AttributesSpec extends AkkaSpec with ScalaFutures { +class AttributesSpec extends AkkaSpec { import AttributesSpec._ val settings = ActorMaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala index 5a18c98f09..8caecb9065 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl import akka.NotUsed -import akka.stream.testkit.AkkaSpec import akka.stream.testkit.Utils._ import org.scalactic.ConversionCheckedTripleEquals import akka.util.ByteString @@ -12,8 +11,9 @@ import akka.stream._ import scala.concurrent.Await import scala.concurrent.duration._ import scala.collection.immutable +import akka.testkit.AkkaSpec -class BidiFlowSpec extends AkkaSpec with ConversionCheckedTripleEquals { +class BidiFlowSpec extends AkkaSpec { import Attributes._ import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAppendSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAppendSpec.scala index 0dbc144c3c..1efb8aad4e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAppendSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAppendSpec.scala @@ -6,9 +6,10 @@ package akka.stream.scaladsl import akka.actor.ActorSystem import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings -import akka.stream.testkit.{ AkkaSpec, TestSubscriber } +import akka.stream.testkit.TestSubscriber import org.reactivestreams.Subscriber import org.scalatest.Matchers +import akka.testkit.AkkaSpec class FlowAppendSpec extends AkkaSpec with River { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchSpec.scala index 2ed9c5df8f..ae7af2e6b2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchSpec.scala @@ -8,6 +8,7 @@ import scala.concurrent.duration._ import scala.concurrent.forkjoin.ThreadLocalRandom import akka.stream.{ OverflowStrategy, ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit._ +import akka.testkit.AkkaSpec class FlowBatchSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchWeightedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchWeightedSpec.scala index 3ec4cad540..0b59748945 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchWeightedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchWeightedSpec.scala @@ -6,6 +6,7 @@ package akka.stream.scaladsl import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit._ import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class FlowBatchWeightedSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala index 68877016e9..a0d616adea 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala @@ -10,6 +10,7 @@ import akka.stream.{ BufferOverflowException, ActorMaterializer, ActorMaterializ import akka.stream.testkit._ import akka.stream.testkit.scaladsl._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class FlowBufferSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCollectSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCollectSpec.scala index f03f74ee3b..d9198236d3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCollectSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCollectSpec.scala @@ -6,7 +6,7 @@ package akka.stream.scaladsl import scala.concurrent.forkjoin.ThreadLocalRandom.{ current ⇒ random } import akka.stream.ActorMaterializerSettings -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.ScriptedTest class FlowCollectSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCompileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCompileSpec.scala index 74088237fb..d4c14c950d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCompileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCompileSpec.scala @@ -11,7 +11,7 @@ import scala.concurrent.Future import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec class FlowCompileSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala index fff4d2623c..e16cd4b8d3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala @@ -11,6 +11,7 @@ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class FlowConcatAllSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala index 13ceb214c3..71ecbf35c9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala @@ -8,12 +8,12 @@ import akka.stream.Attributes.inputBuffer import akka.stream.Supervision.{ resumingDecider, restartingDecider } import akka.stream.testkit.Utils.TE import akka.testkit.TestLatch - import scala.concurrent.Await import scala.concurrent.duration._ import scala.concurrent.forkjoin.ThreadLocalRandom import akka.stream._ import akka.stream.testkit._ +import akka.testkit.AkkaSpec class FlowConflateSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala index 050ab42a51..a98e2389da 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala @@ -6,12 +6,12 @@ package akka.stream.scaladsl import akka.stream.Attributes._ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.TestSink -import akka.stream.testkit.{ AkkaSpec, TestPublisher, TestSubscriber } +import akka.stream.testkit.{ TestPublisher, TestSubscriber } import akka.stream.{ BufferOverflowException, DelayOverflowStrategy, ActorMaterializer } - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import akka.testkit.AkkaSpec class FlowDelaySpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala index ac39e44a55..7f8c671de7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala @@ -5,17 +5,16 @@ package akka.stream.scaladsl import org.scalactic.ConversionCheckedTripleEquals import org.scalatest.concurrent.ScalaFutures -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream._ import scala.concurrent.Await import scala.concurrent.duration._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.Utils -class FlowDetacherSpec extends AkkaSpec with ConversionCheckedTripleEquals with ScalaFutures { +class FlowDetacherSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() - implicit val patience = PatienceConfig(2.seconds) "A Detacher" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala index eb2452c27f..dffe5f87d6 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala @@ -4,7 +4,7 @@ package akka.stream.scaladsl import akka.testkit.TestProbe -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropSpec.scala index 9596a28786..f75317638b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropSpec.scala @@ -4,10 +4,10 @@ package akka.stream.scaladsl import scala.concurrent.forkjoin.ThreadLocalRandom.{ current ⇒ random } - import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ +import akka.testkit.AkkaSpec class FlowDropSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWhileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWhileSpec.scala index 39e9b89f3e..7415a53e5b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWhileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWhileSpec.scala @@ -6,13 +6,12 @@ package akka.stream.scaladsl import akka.stream.ActorAttributes._ import akka.stream.Supervision._ import akka.stream.testkit.Utils._ - import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink - import scala.util.control.NoStackTrace +import akka.testkit.AkkaSpec class FlowDropWhileSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala index 8fbf37cfa4..f335ef1c10 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala @@ -4,9 +4,9 @@ package akka.stream.scaladsl import scala.concurrent.duration._ - import akka.stream.ActorMaterializer import akka.stream.testkit._ +import akka.testkit.AkkaSpec class FlowDropWithinSpec extends AkkaSpec { @@ -47,4 +47,4 @@ class FlowDropWithinSpec extends AkkaSpec { } -} \ No newline at end of file +} diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala index 067185d4b6..10afb841fa 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala @@ -10,6 +10,7 @@ import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSource import akka.stream.testkit.scaladsl.TestSink +import akka.testkit.AkkaSpec class FlowExpandSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala index fae07c2abd..a907a525af 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala @@ -4,10 +4,10 @@ package akka.stream.scaladsl import scala.concurrent.forkjoin.ThreadLocalRandom.{ current ⇒ random } - import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ +import akka.testkit.AkkaSpec class FlowFilterSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala index e0d0bd7a28..367fe31f73 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala @@ -4,7 +4,7 @@ package akka.stream.scaladsl import akka.NotUsed -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.ActorMaterializer import scala.concurrent._ import scala.concurrent.duration._ @@ -15,7 +15,7 @@ import org.scalatest.exceptions.TestFailedException import akka.stream.testkit.scaladsl.TestSink import akka.testkit.TestLatch -class FlowFlattenMergeSpec extends AkkaSpec with ScalaFutures with ConversionCheckedTripleEquals { +class FlowFlattenMergeSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() import system.dispatcher @@ -25,8 +25,6 @@ class FlowFlattenMergeSpec extends AkkaSpec with ScalaFutures with ConversionChe val toSeq = Flow[Int].grouped(1000).toMat(Sink.head)(Keep.right) val toSet = toSeq.mapMaterializedValue(_.map(_.toSet)) - implicit val patience = PatienceConfig(1.second) - "A FattenMerge" must { "work in the nominal case" in { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala index 319972aab5..5004a8f02f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala @@ -9,7 +9,7 @@ import scala.concurrent.Await import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.Utils._ import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala index f960b9992a..13dcba517d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala @@ -9,6 +9,7 @@ import akka.stream.testkit._ import akka.stream.testkit.Utils._ import scala.concurrent.Await import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class FlowForeachSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala index 1362c29916..74b3ebf387 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala @@ -6,11 +6,11 @@ package akka.stream.scaladsl import scala.concurrent.{ Future, Promise } import scala.concurrent.duration._ import scala.util.control.NoStackTrace - import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class FlowFromFutureSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala index cf04794a77..a2aa2d7318 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala @@ -6,6 +6,7 @@ package akka.stream.scaladsl import akka.stream.{ ClosedShape, ActorMaterializer, OverflowStrategy } import akka.stream.testkit._ import akka.stream.stage._ +import akka.testkit.AkkaSpec object FlowGraphCompileSpec { class Fruit diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala index e7da7b9d95..30d8cda9aa 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl import akka.NotUsed - import scala.concurrent.duration._ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings @@ -18,6 +17,7 @@ import org.scalactic.ConversionCheckedTripleEquals import org.scalatest.concurrent.PatienceConfiguration.Timeout import akka.stream.testkit.scaladsl.TestSource import akka.stream.testkit.scaladsl.TestSink +import akka.testkit.AkkaSpec object FlowGroupBySpec { @@ -27,7 +27,7 @@ object FlowGroupBySpec { } -class FlowGroupBySpec extends AkkaSpec with ScalaFutures with ConversionCheckedTripleEquals { +class FlowGroupBySpec extends AkkaSpec { import FlowGroupBySpec._ val settings = ActorMaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala index 0ef4a5197a..fa026efba4 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala @@ -7,7 +7,7 @@ import scala.collection.immutable import scala.concurrent.forkjoin.ThreadLocalRandom.{ current ⇒ random } import akka.stream.ActorMaterializerSettings -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.ScriptedTest class FlowGroupedSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala index 37f1119b37..1bdbf5d75f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala @@ -6,11 +6,11 @@ package akka.stream.scaladsl import scala.collection.immutable import scala.concurrent.duration._ import scala.concurrent.forkjoin.ThreadLocalRandom.{ current ⇒ random } - import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class FlowGroupedWithinSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIdleInjectSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIdleInjectSpec.scala index 4b2c239e3a..45482e49f7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIdleInjectSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIdleInjectSpec.scala @@ -1,10 +1,10 @@ package akka.stream.scaladsl import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } -import akka.stream.testkit.{ TestSubscriber, TestPublisher, Utils, AkkaSpec } - +import akka.stream.testkit.{ TestSubscriber, TestPublisher, Utils } import scala.concurrent.Await import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class FlowIdleInjectSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInitialDelaySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInitialDelaySpec.scala index e758cdbbea..fe97126e64 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInitialDelaySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInitialDelaySpec.scala @@ -1,12 +1,11 @@ package akka.stream.scaladsl import java.util.concurrent.TimeoutException - import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } -import akka.stream.testkit.{ Utils, TestSubscriber, AkkaSpec } - +import akka.stream.testkit.{ Utils, TestSubscriber } import scala.concurrent.Await import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class FlowInitialDelaySpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala index 32a48addcf..c95d0168e4 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala @@ -7,10 +7,10 @@ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.{ TestSource, TestSink } import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import org.scalatest.concurrent.ScalaFutures - import scala.concurrent.duration._ +import akka.testkit.AkkaSpec -class FlowIntersperseSpec extends AkkaSpec with ScalaFutures { +class FlowIntersperseSpec extends AkkaSpec { val settings = ActorMaterializerSettings(system) .withInputBuffer(initialSize = 2, maxSize = 16) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala index 66acf0338a..2a60b26fe7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala @@ -11,6 +11,7 @@ import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.testkit.EventFilter +import akka.testkit.AkkaSpec class FlowIteratorSpec extends AbstractFlowIteratorSpec { override def testName = "A Flow based on an iterator producing function" diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala index 97e2d37a10..27f0519f5f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala @@ -7,13 +7,14 @@ import akka.stream.{ FlowShape, ActorMaterializer, ActorMaterializerSettings, Ov import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl._ +import akka.testkit.AkkaSpec import com.typesafe.config.ConfigFactory import org.scalatest.concurrent.ScalaFutures import org.scalatest.time._ import scala.collection.immutable -class FlowJoinSpec extends AkkaSpec(ConfigFactory.parseString("akka.loglevel=INFO")) with ScalaFutures { +class FlowJoinSpec extends AkkaSpec(ConfigFactory.parseString("akka.loglevel=INFO")) { val settings = ActorMaterializerSettings(system) .withInputBuffer(initialSize = 2, maxSize = 16) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitSpec.scala index 338716b324..e071d809ab 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitSpec.scala @@ -4,7 +4,7 @@ package akka.stream.scaladsl import akka.stream.{ StreamLimitReachedException, ActorMaterializer, ActorMaterializerSettings } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitWeightedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitWeightedSpec.scala index 38e031ea40..30da37e032 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitWeightedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitWeightedSpec.scala @@ -4,7 +4,7 @@ package akka.stream.scaladsl import akka.stream.{ StreamLimitReachedException, ActorMaterializer, ActorMaterializerSettings } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogSpec.scala index 88a16a3942..a86294da6f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogSpec.scala @@ -8,14 +8,14 @@ import akka.event.{ DummyClassForStringSources, Logging } import akka.stream.ActorAttributes._ import akka.stream.Attributes.LogLevels import akka.stream.Supervision._ -import akka.stream.testkit.{ AkkaSpec, ScriptedTest } +import akka.stream.testkit.ScriptedTest import akka.stream.javadsl import akka.stream.{ ActorMaterializer, Materializer, Attributes } import akka.testkit.TestProbe import scala.concurrent.duration._ - import scala.concurrent.Await import scala.util.control.NoStackTrace +import akka.testkit.AkkaSpec class FlowLogSpec extends AkkaSpec("akka.loglevel = DEBUG") with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala index ed2fdf1b17..37b77b3f48 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala @@ -21,8 +21,9 @@ import scala.concurrent.Promise import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.LinkedBlockingQueue import org.scalatest.concurrent.ScalaFutures +import akka.testkit.AkkaSpec -class FlowMapAsyncSpec extends AkkaSpec with ScalaFutures { +class FlowMapAsyncSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala index 4cdba994f5..f772acdd96 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala @@ -22,8 +22,9 @@ import java.util.concurrent.LinkedBlockingQueue import scala.annotation.tailrec import org.scalatest.concurrent.ScalaFutures import org.scalactic.ConversionCheckedTripleEquals +import akka.testkit.AkkaSpec -class FlowMapAsyncUnorderedSpec extends AkkaSpec with ScalaFutures with ConversionCheckedTripleEquals { +class FlowMapAsyncUnorderedSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala index 79674c19d3..d3eb54fb0c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala @@ -7,8 +7,8 @@ import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ Supervision, ActorAttributes, ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit.Utils._ import akka.stream.testkit._ - import scala.util.control.NoStackTrace +import akka.testkit.AkkaSpec class FlowMapConcatSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapSpec.scala index e7c14cf251..3a585f2686 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapSpec.scala @@ -4,10 +4,10 @@ package akka.stream.scaladsl import scala.concurrent.forkjoin.ThreadLocalRandom.{ current ⇒ random } - import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ +import akka.testkit.AkkaSpec class FlowMapSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala index 8d020a3712..cd0517c177 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala @@ -4,16 +4,15 @@ package akka.stream.scaladsl import akka.Done - import scala.concurrent.duration._ import scala.util.{ Failure, Success } import scala.util.control.NoStackTrace - import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.testkit.TestProbe +import akka.testkit.AkkaSpec class FlowOnCompleteSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala index e341a73fbe..3aa7c5c2e1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala @@ -10,6 +10,7 @@ import scala.util.control.NoStackTrace import akka.stream._ import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class FlowPrefixAndTailSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala index af8d1ad468..d08a1ecf58 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala @@ -6,7 +6,7 @@ package akka.stream.scaladsl import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit.Utils._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.util.control.NoStackTrace diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverWithSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverWithSpec.scala index 698b3f0a34..e1fae1205c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverWithSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverWithSpec.scala @@ -6,7 +6,7 @@ package akka.stream.scaladsl import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit.Utils._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.util.control.NoStackTrace diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala index 1fd973e57b..a869ea8b8d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala @@ -7,7 +7,7 @@ import scala.concurrent.Await import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.Utils._ import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala index 32d3c7ee32..aed8ce7e73 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala @@ -6,7 +6,7 @@ package akka.stream.scaladsl import akka.NotUsed import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ ActorAttributes, ActorMaterializer, ActorMaterializerSettings, Supervision } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.Utils._ import scala.collection.immutable diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala index da36aea1c7..ec27772f6c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala @@ -5,8 +5,8 @@ package akka.stream.scaladsl import akka.stream.Attributes._ import akka.stream.ActorAttributes._ -import akka.stream.{ ActorMaterializer } -import akka.stream.testkit.AkkaSpec +import akka.stream.ActorMaterializer +import akka.testkit.AkkaSpec import akka.actor.ActorRef import akka.testkit.TestProbe diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala index 9134970224..d7b207b24a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala @@ -10,8 +10,9 @@ import org.scalacheck.Gen import org.scalatest.concurrent.ScalaFutures import org.scalatest.prop.GeneratorDrivenPropertyChecks import akka.pattern.pipe +import akka.testkit.AkkaSpec -class FlowSlidingSpec extends AkkaSpec with GeneratorDrivenPropertyChecks with ScalaFutures { +class FlowSlidingSpec extends AkkaSpec with GeneratorDrivenPropertyChecks { import system.dispatcher val settings = ActorMaterializerSettings(system) .withInputBuffer(initialSize = 2, maxSize = 16) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala index 3360f5cfce..c1803aebe8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala @@ -23,6 +23,7 @@ import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace import akka.stream.impl.fusing.GraphInterpreterShell +import akka.testkit.AkkaSpec object FlowSpec { class Fruit @@ -31,8 +32,7 @@ object FlowSpec { } -class FlowSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.receive=off\nakka.loglevel=INFO")) - with ScalaFutures { +class FlowSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.receive=off\nakka.loglevel=INFO")) { import FlowSpec._ val settings = ActorMaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala index 53a31da1aa..854942bc31 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala @@ -6,7 +6,7 @@ package akka.stream.scaladsl import akka.NotUsed import akka.stream._ import akka.stream.Supervision.resumingDecider -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.TestPublisher import akka.stream.testkit.TestSubscriber import akka.stream.testkit.Utils._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala index e25f98a3a7..92f63ee570 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala @@ -12,6 +12,7 @@ import akka.stream.testkit._ import org.reactivestreams.Publisher import scala.concurrent.Await import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class FlowSplitWhenSpec extends AkkaSpec { import FlowSplitAfterSpec._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala index efc23f9b68..ecba234df3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala @@ -17,6 +17,7 @@ import scala.concurrent.duration._ import scala.util.control.NoStackTrace import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource +import akka.testkit.AkkaSpec class FlowStageSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.receive=off\nakka.loglevel=INFO")) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStatefulMapConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStatefulMapConcatSpec.scala index f262751d1d..922f6f9db7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStatefulMapConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStatefulMapConcatSpec.scala @@ -6,8 +6,8 @@ package akka.stream.scaladsl import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ ActorMaterializer, ActorAttributes, Supervision, ActorMaterializerSettings } import akka.stream.testkit._ - import scala.util.control.NoStackTrace +import akka.testkit.AkkaSpec class FlowStatefulMapConcatSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala index 2c1d468b4c..fc7e18c845 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala @@ -13,6 +13,7 @@ import akka.stream.Supervision import akka.stream.impl.ReactiveStreamsCompliance import akka.stream.ActorAttributes import akka.NotUsed +import akka.testkit.AkkaSpec class FlowSupervisionSpec extends AkkaSpec { import ActorAttributes.supervisionStrategy diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala index 47f4ec1b92..133ef846e2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala @@ -6,13 +6,13 @@ package akka.stream.scaladsl import scala.concurrent.Await import scala.concurrent.duration._ import scala.concurrent.forkjoin.ThreadLocalRandom.{ current ⇒ random } - import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.actor.ActorSubscriberMessage.OnComplete import akka.stream.actor.ActorSubscriberMessage.OnNext import akka.stream.impl.RequestMore import akka.stream.testkit._ +import akka.testkit.AkkaSpec class FlowTakeSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala index 08ac3e369d..34f6782667 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala @@ -6,13 +6,12 @@ package akka.stream.scaladsl import akka.stream.ActorAttributes._ import akka.stream.Supervision._ import akka.stream.testkit.Utils._ - import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink - import scala.util.control.NoStackTrace +import akka.testkit.AkkaSpec class FlowTakeWhileSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala index 1eacaf3d42..839380b6d1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala @@ -4,10 +4,10 @@ package akka.stream.scaladsl import scala.concurrent.duration._ - import akka.stream.ActorMaterializer import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class FlowTakeWithinSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowThrottleSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowThrottleSpec.scala index d13c7f83f7..933324ccd3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowThrottleSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowThrottleSpec.scala @@ -8,11 +8,11 @@ import akka.stream._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink import akka.util.ByteString - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.Random import scala.util.control.NoStackTrace +import akka.testkit.AkkaSpec class FlowThrottleSpec extends AkkaSpec { implicit val materializer = ActorMaterializer(ActorMaterializerSettings(system).withInputBuffer(1, 1)) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala index dc3f1f4244..40ef1adced 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala @@ -6,7 +6,7 @@ package akka.stream.scaladsl import akka.Done import akka.pattern.pipe import akka.stream._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.{ TestSink, TestSource } import org.scalactic.ConversionCheckedTripleEquals @@ -15,12 +15,11 @@ import org.scalatest.concurrent.ScalaFutures import scala.util.control.NoStackTrace import scala.concurrent.duration._ -class FlowWatchTerminationSpec extends AkkaSpec with ScalaFutures with ConversionCheckedTripleEquals { +class FlowWatchTerminationSpec extends AkkaSpec { val settings = ActorMaterializerSettings(system) implicit val materializer = ActorMaterializer(settings) - implicit val patience = PatienceConfig(3.seconds) "A WatchTermination" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FramingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FramingSpec.scala index 3dbbe0d956..040851abdd 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FramingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FramingSpec.scala @@ -7,7 +7,7 @@ import java.nio.ByteOrder import akka.stream.scaladsl.Framing.FramingException import akka.stream.stage.{ Context, PushPullStage, SyncDirective, TerminationDirective } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.util.{ ByteString, ByteStringBuilder } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBackedFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBackedFlowSpec.scala index 3a171c6be7..6de24d32a4 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBackedFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBackedFlowSpec.scala @@ -8,6 +8,7 @@ import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream._ import org.reactivestreams.Subscriber +import akka.testkit.AkkaSpec object GraphFlowSpec { val source1 = Source(0 to 3) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala index a855286c87..81f755995d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala @@ -3,11 +3,11 @@ package akka.stream.scaladsl import scala.concurrent.Await import scala.concurrent.duration._ import scala.concurrent.Future - import akka.stream.{ SourceShape, ClosedShape, ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit._ import akka.stream.testkit.scaladsl._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class GraphBalanceSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala index 528d853212..9997a01d68 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala @@ -1,13 +1,12 @@ package akka.stream.scaladsl import akka.stream.testkit.scaladsl.TestSink - import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ - import akka.stream._ import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class GraphBroadcastSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala index f6613697fe..3fd0327754 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala @@ -5,10 +5,10 @@ package akka.stream.scaladsl import akka.stream._ import akka.stream.testkit._ - import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class GraphMatValueSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala index 8a78a13560..86c0161fe5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala @@ -12,7 +12,7 @@ import scala.concurrent.duration._ import org.scalactic.ConversionCheckedTripleEquals import org.scalacheck.Shrink -class GraphMergeSortedSpec extends TwoStreamsSetup with GeneratorDrivenPropertyChecks with ScalaFutures with ConversionCheckedTripleEquals { +class GraphMergeSortedSpec extends TwoStreamsSetup with GeneratorDrivenPropertyChecks { override type Outputs = Int @@ -24,7 +24,6 @@ class GraphMergeSortedSpec extends TwoStreamsSetup with GeneratorDrivenPropertyC override def out: Outlet[Outputs] = merge.out } - implicit val patience = PatienceConfig(1.second) implicit def noShrink[T] = Shrink[T](_ ⇒ Stream.empty) // do not shrink failures, it only destroys evidence "MergeSorted" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala index 72e1529f34..3589a2a1b0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala @@ -1,13 +1,13 @@ package akka.stream.scaladsl import akka.NotUsed - import scala.collection.immutable import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ import akka.stream._ import akka.stream.testkit._ import org.scalactic.ConversionCheckedTripleEquals +import akka.testkit.AkkaSpec object GraphOpsIntegrationSpec { import GraphDSL.Implicits._ @@ -43,7 +43,7 @@ object GraphOpsIntegrationSpec { } -class GraphOpsIntegrationSpec extends AkkaSpec with ConversionCheckedTripleEquals { +class GraphOpsIntegrationSpec extends AkkaSpec { import akka.stream.scaladsl.GraphOpsIntegrationSpec._ import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala index e2994a36c6..276081b61c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala @@ -1,7 +1,7 @@ package akka.stream.scaladsl import akka.stream.{ ClosedShape, ActorMaterializer, ActorMaterializerSettings, FlowShape } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.concurrent.{ Await } import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala index 95420d9b04..92ce9460ad 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala @@ -9,8 +9,9 @@ import akka.stream.testkit.Utils._ import org.scalatest.concurrent.ScalaFutures import scala.concurrent.Await import scala.concurrent.duration._ +import akka.testkit.AkkaSpec -class GraphPartitionSpec extends AkkaSpec with ScalaFutures { +class GraphPartitionSpec extends AkkaSpec { val settings = ActorMaterializerSettings(system) .withInputBuffer(initialSize = 2, maxSize = 16) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala index 3255c8fa76..261b6c082c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala @@ -7,7 +7,7 @@ import akka.actor.ActorRef import akka.stream.{ Attributes, ActorMaterializer } import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.stage.{ TimerGraphStageLogic, OutHandler, AsyncCallback, InHandler } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.testkit.TestDuration import scala.concurrent.Promise diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala index fddc6a04b0..4312b5532a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala @@ -4,10 +4,10 @@ package akka.stream.scaladsl import scala.concurrent.duration._ - import akka.stream.{ ClosedShape, OverflowStrategy, ActorMaterializerSettings, ActorMaterializer } import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class GraphUnzipSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala index 5a7ea24364..887f86c956 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala @@ -11,6 +11,7 @@ import org.reactivestreams.Publisher import scala.concurrent.duration._ import scala.util.control.NoStackTrace import akka.testkit.EventFilter +import akka.testkit.AkkaSpec class GraphUnzipWithSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala index eb780361d7..e9a73c30e3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala @@ -11,6 +11,7 @@ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class HeadSinkSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala index 799c1f9ca1..16a8e69347 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala @@ -10,6 +10,7 @@ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class LastSinkSpec extends AkkaSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala index 5c4665abda..aa2b5cddb3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala @@ -5,7 +5,7 @@ package akka.stream.scaladsl import akka.stream.{ ClosedShape, ActorMaterializer } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.stream.testkit.Utils._ import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala index fa3be143bb..f103a429b5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala @@ -8,17 +8,16 @@ import akka.pattern.pipe import akka.stream.Attributes.inputBuffer import akka.stream.{ ActorMaterializer } import akka.stream.testkit.Utils._ -import akka.stream.testkit.{ AkkaSpec, _ } +import akka.stream.testkit._ import org.scalatest.concurrent.ScalaFutures - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import akka.testkit.AkkaSpec -class QueueSinkSpec extends AkkaSpec with ScalaFutures { +class QueueSinkSpec extends AkkaSpec { implicit val ec = system.dispatcher implicit val materializer = ActorMaterializer() - implicit val patience = PatienceConfig(2.second) val ex = new RuntimeException("ex") with NoStackTrace diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala index e94817a983..55a0edd039 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala @@ -9,9 +9,9 @@ import akka.stream._ import akka.stream.impl.QueueSource import akka.stream.testkit.Utils._ import akka.stream.testkit._ -import akka.testkit.TestProbe +import akka.testkit.{ AkkaSpec, TestProbe } import scala.concurrent.duration._ -import scala.concurrent.{ Future, _ } +import scala.concurrent._ import akka.Done class QueueSourceSpec extends AkkaSpec { @@ -24,7 +24,7 @@ class QueueSourceSpec extends AkkaSpec { expectMsg(QueueOfferResult.Enqueued) } - "A QueueSourceSpec" must { + "A QueueSource" must { "emit received messages to the stream" in { val s = TestSubscriber.manualProbe[Int]() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala index 45476cd47b..075526a7f5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala @@ -5,8 +5,9 @@ import akka.stream._ import scala.concurrent.Await import scala.concurrent.duration._ import org.scalactic.ConversionCheckedTripleEquals +import akka.testkit.AkkaSpec -class ReverseArrowSpec extends AkkaSpec with ConversionCheckedTripleEquals { +class ReverseArrowSpec extends AkkaSpec { import GraphDSL.Implicits._ implicit val materializer = ActorMaterializer() diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SeqSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SeqSinkSpec.scala index 96f62b6196..5813e14b84 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SeqSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SeqSinkSpec.scala @@ -4,7 +4,7 @@ package akka.stream.scaladsl import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.collection.immutable import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala index c132905ecc..6bfa3d83c3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala @@ -7,7 +7,7 @@ import akka.stream.ActorMaterializer import akka.stream.ActorAttributes._ import akka.stream.Supervision._ import akka.stream.testkit.Utils._ -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import akka.testkit.{ TestLatch, TestProbe } import scala.concurrent.Await diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala index d20f03fde2..77331f0b82 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala @@ -7,16 +7,15 @@ import akka.stream._ import akka.stream.testkit._ import org.scalactic.ConversionCheckedTripleEquals import org.scalatest.concurrent.ScalaFutures - import scala.concurrent.Future import scala.concurrent.duration._ +import akka.testkit.AkkaSpec -class SinkSpec extends AkkaSpec with ConversionCheckedTripleEquals with ScalaFutures { +class SinkSpec extends AkkaSpec { import GraphDSL.Implicits._ implicit val materializer = ActorMaterializer() - implicit val patience = PatienceConfig(2.seconds) "A Sink" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala index 00f3e3f4a4..2088d8e133 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala @@ -14,8 +14,9 @@ import akka.stream._ import akka.stream.testkit._ import akka.NotUsed import akka.testkit.EventFilter +import akka.testkit.AkkaSpec -class SourceSpec extends AkkaSpec with DefaultTimeout with ScalaFutures { +class SourceSpec extends AkkaSpec with DefaultTimeout { implicit val materializer = ActorMaterializer() implicit val config = PatienceConfig(timeout = Span(timeout.duration.toMillis, Millis)) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala index 53e24f20cc..6ff9e9d9d5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala @@ -7,14 +7,13 @@ import akka.actor.{ Kill, PoisonPill, NoSerializationVerificationNeeded, ActorRe import akka.event.Logging import akka.stream._ import akka.stream.stage.{ GraphStageWithMaterializedValue, GraphStageLogic, InHandler } -import akka.stream.testkit.AkkaSpec -import akka.testkit.{ TestProbe, TestEvent, EventFilter, ImplicitSender } +import akka.testkit.{ AkkaSpec, TestProbe, TestEvent, EventFilter, ImplicitSender } import org.scalatest.concurrent.ScalaFutures import scala.concurrent.{ Future, Promise } import scala.concurrent.duration._ -class StageActorRefSpec extends AkkaSpec with ImplicitSender with ScalaFutures { +class StageActorRefSpec extends AkkaSpec with ImplicitSender { implicit val materializer = ActorMaterializer() import StageActorRefSpec._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala index f84216515a..293530e9e9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala @@ -7,6 +7,7 @@ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class SubscriberSinkSpec extends AkkaSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala index 3a728891b0..ec0d9f8bfb 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala @@ -5,7 +5,7 @@ package akka.stream.scaladsl import akka.stream.ActorMaterializer -import akka.stream.testkit.AkkaSpec +import akka.testkit.AkkaSpec import scala.concurrent.duration._ import scala.concurrent.Await diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala index 4f6150da1f..ffcf851750 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala @@ -7,6 +7,7 @@ import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.impl.SubscriptionTimeoutException import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala index 87cea362c8..6c545da23f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala @@ -7,6 +7,7 @@ import scala.concurrent.duration._ import akka.stream.{ ClosedShape, ActorMaterializer } import akka.stream.testkit._ import akka.stream.testkit.Utils._ +import akka.testkit.AkkaSpec class TickSourceSpec extends AkkaSpec { diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala index 7892f11a2b..c7cda3df81 100644 --- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala @@ -5,7 +5,7 @@ package akka.testkit import org.scalactic.Constraint -import language.{ postfixOps } +import language.postfixOps import org.scalatest.{ WordSpecLike, BeforeAndAfterAll } import org.scalatest.Matchers import akka.actor.ActorSystem @@ -16,6 +16,7 @@ import com.typesafe.config.{ Config, ConfigFactory } import akka.dispatch.Dispatchers import akka.testkit.TestEvent._ import org.scalactic.ConversionCheckedTripleEquals +import org.scalatest.concurrent.ScalaFutures object AkkaSpec { val testConf: Config = ConfigFactory.parseString(""" @@ -54,8 +55,10 @@ object AkkaSpec { } abstract class AkkaSpec(_system: ActorSystem) - extends TestKit(_system) with WordSpecLike with Matchers with BeforeAndAfterAll with WatchedByCoroner - with ConversionCheckedTripleEquals { + extends TestKit(_system) with WordSpecLike with Matchers with BeforeAndAfterAll with WatchedByCoroner + with ConversionCheckedTripleEquals with ScalaFutures { + + implicit val patience = PatienceConfig(testKitSettings.DefaultTimeout.duration) def this(config: Config) = this(ActorSystem(AkkaSpec.getCallerName(getClass), ConfigFactory.load(config.withFallback(AkkaSpec.testConf)))) @@ -106,4 +109,9 @@ abstract class AkkaSpec(_system: ActorSystem) new Constraint[Class[A], Class[B]] { def areEqual(a: Class[A], b: Class[B]) = a == b } + + implicit def setEqualityConstraint[A, T <: Set[_ <: A]]: Constraint[Set[A], T] = + new Constraint[Set[A], T] { + def areEqual(a: Set[A], b: T) = a == b + } } diff --git a/akka-typed/src/test/scala/akka/typed/ActorContextSpec.scala b/akka-typed/src/test/scala/akka/typed/ActorContextSpec.scala index 708cfdc175..55f9e9f2ba 100644 --- a/akka-typed/src/test/scala/akka/typed/ActorContextSpec.scala +++ b/akka-typed/src/test/scala/akka/typed/ActorContextSpec.scala @@ -159,7 +159,7 @@ class ActorContextSpec extends TypedSpec(ConfigFactory.parseString( | lifecycle = off | autoreceive = off | } - |}""".stripMargin)) with ConversionCheckedTripleEquals { + |}""".stripMargin)) { import ActorContextSpec._ import ScalaDSL._ diff --git a/akka-typed/src/test/scala/akka/typed/BehaviorSpec.scala b/akka-typed/src/test/scala/akka/typed/BehaviorSpec.scala index e39e87d9dd..9ce6bd9dac 100644 --- a/akka-typed/src/test/scala/akka/typed/BehaviorSpec.scala +++ b/akka-typed/src/test/scala/akka/typed/BehaviorSpec.scala @@ -5,7 +5,7 @@ package akka.typed import org.scalautils.ConversionCheckedTripleEquals -class BehaviorSpec extends TypedSpec with ConversionCheckedTripleEquals { +class BehaviorSpec extends TypedSpec { sealed trait Command { def expectedResponse(ctx: ActorContext[Command]): Seq[Event] = Nil diff --git a/akka-typed/src/test/scala/akka/typed/TypedSpec.scala b/akka-typed/src/test/scala/akka/typed/TypedSpec.scala index 36ef58f8e8..760af3d57b 100644 --- a/akka-typed/src/test/scala/akka/typed/TypedSpec.scala +++ b/akka-typed/src/test/scala/akka/typed/TypedSpec.scala @@ -18,11 +18,14 @@ import akka.actor.ActorInitializationException import language.existentials import akka.testkit.EventFilter import akka.testkit.TestEvent.Mute +import org.scalatest.concurrent.ScalaFutures +import org.scalactic.ConversionCheckedTripleEquals +import org.scalactic.Constraint /** * Helper class for writing tests for typed Actors with ScalaTest. */ -class TypedSpec(config: Config) extends Spec with Matchers with BeforeAndAfterAll { +class TypedSpec(config: Config) extends Spec with Matchers with BeforeAndAfterAll with ScalaFutures with ConversionCheckedTripleEquals { import TypedSpec._ import AskPattern._ @@ -30,7 +33,8 @@ class TypedSpec(config: Config) extends Spec with Matchers with BeforeAndAfterAl implicit val system = ActorSystem(AkkaSpec.getCallerName(classOf[TypedSpec]), Props(guardian()), Some(config withFallback AkkaSpec.testConf)) - implicit def timeout = Timeout(1.minute) + implicit val timeout = Timeout(1.minute) + implicit val patience = PatienceConfig(3.seconds) override def afterAll(): Unit = { Await.result(system ? (Terminate(_)), timeout.duration): Status @@ -80,6 +84,17 @@ class TypedSpec(config: Config) extends Spec with Matchers with BeforeAndAfterAl def assertEmpty(inboxes: Inbox.SyncInbox[_]*): Unit = { inboxes foreach (i ⇒ withClue(s"inbox $i had messages")(i.hasMessages should be(false))) } + + // for ScalaTest === compare of Class objects + implicit def classEqualityConstraint[A, B]: Constraint[Class[A], Class[B]] = + new Constraint[Class[A], Class[B]] { + def areEqual(a: Class[A], b: Class[B]) = a == b + } + + implicit def setEqualityConstraint[A, T <: Set[_ <: A]]: Constraint[Set[A], T] = + new Constraint[Set[A], T] { + def areEqual(a: Set[A], b: T) = a == b + } } object TypedSpec { diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 75287ca4ab..9ea4d8a0dd 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -229,7 +229,7 @@ object AkkaBuild extends Build { lazy val httpTests = Project( id = "akka-http-tests", base = file("akka-http-tests"), - dependencies = Seq(httpTestkit % "test", httpSprayJson, httpXml, httpJackson) + dependencies = Seq(httpTestkit % "test", testkit % "test->test", httpSprayJson, httpXml, httpJackson) ) lazy val httpMarshallersScala = Project(