From fc23f03031ddbfe037ee1d0abea90f1afc07a343 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Sun, 17 Feb 2019 11:45:39 -0800 Subject: [PATCH] upgrade to latest ScalaTest (#26387) stuff moved to a new package. you wouldn't expect that in a point release, but they put type aliases in place so Scala users wouldn't notice. but the change is visible to Java code. the upgrade is not strictly necessary, but it would be convenient for the Scala 2.13 community build to have this merged, so I don't have to maintain these changes in our Akka fork --- .../java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java | 2 +- .../akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java | 2 +- .../java/akka/actor/testkit/typed/javadsl/TestProbeTest.java | 2 +- .../actor/testkit/typed/javadsl/AsyncTestingExampleTest.java | 2 +- .../actor/testkit/typed/javadsl/ManualTimerExampleTest.java | 2 +- .../actor/testkit/typed/javadsl/SyncTestingExampleTest.java | 2 +- .../src/test/java/akka/actor/AbstractFSMActorTest.java | 2 +- .../src/test/java/akka/actor/ActorCreationTest.java | 2 +- .../src/test/java/akka/actor/ActorSelectionTest.java | 2 +- akka-actor-tests/src/test/java/akka/actor/ActorSystemTest.java | 2 +- akka-actor-tests/src/test/java/akka/actor/InboxJavaAPITest.java | 2 +- akka-actor-tests/src/test/java/akka/actor/JavaAPI.java | 2 +- akka-actor-tests/src/test/java/akka/actor/JavaExtension.java | 2 +- akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java | 2 +- .../src/test/java/akka/actor/setup/ActorSystemSetupTest.java | 2 +- .../src/test/java/akka/dispatch/JavaFutureTests.java | 2 +- .../src/test/java/akka/event/LoggingAdapterTest.java | 2 +- akka-actor-tests/src/test/java/akka/japi/JavaAPITestBase.java | 2 +- akka-actor-tests/src/test/java/akka/japi/MatchBuilderTest.java | 2 +- akka-actor-tests/src/test/java/akka/japi/pf/PFBuilderTest.java | 2 +- .../src/test/java/akka/japi/pf/ReceiveBuilderTest.java | 2 +- .../src/test/java/akka/pattern/CircuitBreakerTest.java | 2 +- akka-actor-tests/src/test/java/akka/pattern/PatternsTest.java | 2 +- akka-actor-tests/src/test/java/akka/util/ByteStringTest.java | 2 +- akka-actor-tests/src/test/java/akka/util/JavaDuration.java | 2 +- .../src/test/scala/akka/actor/ActorWithStashSpec.scala | 2 +- akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala | 2 +- akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala | 2 +- akka-actor-tests/src/test/scala/akka/japi/JavaAPITest.scala | 2 +- .../src/test/scala/akka/util/JavaDurationSpec.scala | 2 +- .../src/test/java/akka/actor/typed/ActorSystemTest.java | 2 +- .../src/test/java/akka/actor/typed/ExtensionsTest.java | 2 +- .../test/java/akka/actor/typed/javadsl/ActorContextAskTest.java | 2 +- .../akka/actor/typed/javadsl/ActorContextPipeToSelfTest.java | 2 +- .../test/java/akka/actor/typed/javadsl/ActorLoggingTest.java | 2 +- .../src/test/java/akka/actor/typed/javadsl/AdapterTest.java | 2 +- .../test/java/akka/actor/typed/javadsl/BehaviorBuilderTest.java | 2 +- .../src/test/java/akka/actor/typed/javadsl/InterceptTest.java | 2 +- .../test/java/akka/actor/typed/javadsl/ReceiveBuilderTest.java | 2 +- .../src/test/java/akka/actor/typed/javadsl/WatchTest.java | 2 +- .../src/test/java/jdocs/akka/typed/BubblingSampleTest.java | 2 +- .../src/test/java/jdocs/akka/typed/DispatchersDocTest.java | 2 +- .../src/test/java/jdocs/akka/typed/InteractionPatternsTest.java | 2 +- .../src/test/java/jdocs/akka/typed/StashDocTest.java | 2 +- .../jdocs/akka/typed/coexistence/TypedWatchingUntypedTest.java | 2 +- .../jdocs/akka/typed/coexistence/UntypedWatchingTypedTest.java | 2 +- akka-camel/src/test/java/akka/camel/ConsumerJavaTest.java | 2 +- akka-camel/src/test/java/akka/camel/CustomRouteTest.java | 2 +- akka-camel/src/test/java/akka/camel/MessageJavaTest.java | 2 +- .../sharding/typed/javadsl/ClusterShardingPersistenceTest.java | 2 +- .../sharding/typed/HelloWorldEventSourcedEntityExampleTest.java | 2 +- .../src/test/java/akka/cluster/client/ClusterClientTest.java | 2 +- .../java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java | 2 +- .../java/akka/cluster/ddata/typed/javadsl/ReplicatorTest.java | 2 +- .../src/test/java/akka/cluster/typed/ClusterApiTest.java | 2 +- .../java/jdocs/akka/cluster/typed/ReceptionistExampleTest.java | 2 +- .../src/test/java/akka/contrib/pattern/ReliableProxyTest.java | 2 +- .../java/akka/contrib/throttle/TimerBasedThrottlerTest.java | 2 +- akka-docs/src/test/java/jdocs/AbstractJavaTest.java | 2 +- .../test/java/jdocs/tutorial_1/ActorHierarchyExperiments.java | 2 +- akka-docs/src/test/java/jdocs/tutorial_3/DeviceTest.java | 2 +- akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java | 2 +- akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java | 2 +- .../src/test/java/jdocs/tutorial_5/DeviceGroupQueryTest.java | 2 +- akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java | 2 +- akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java | 2 +- .../java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java | 2 +- akka-docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java | 2 +- .../src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java | 2 +- .../src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java | 2 +- akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java | 2 +- .../test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java | 2 +- .../src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java | 2 +- .../src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java | 2 +- akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java | 2 +- .../persistence/typed/javadsl/EventSourcedActorFailureTest.java | 2 +- .../java/akka/persistence/typed/javadsl/NullEmptyStateTest.java | 2 +- .../persistence/typed/javadsl/PersistentActorJavaDslTest.java | 2 +- .../java/akka/persistence/typed/javadsl/PrimitiveStateTest.java | 2 +- .../java/akka/persistence/fsm/AbstractPersistentFSMTest.java | 2 +- .../akka/stream/tck/AkkaIdentityProcessorVerification.scala | 2 +- .../test/scala/akka/stream/tck/AkkaPublisherVerification.scala | 2 +- .../test/scala/akka/stream/tck/AkkaSubscriberVerification.scala | 2 +- .../src/test/scala/akka/stream/tck/SinkholeSubscriberTest.scala | 2 +- akka-stream-tests/src/test/java/akka/stream/StreamTest.java | 2 +- project/Dependencies.scala | 2 +- 86 files changed, 86 insertions(+), 86 deletions(-) diff --git a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java index 14aa41ef6e..4dea80aa2d 100644 --- a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java @@ -8,7 +8,7 @@ import akka.Done; import akka.actor.typed.javadsl.Behaviors; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.HashMap; import java.util.concurrent.CompletableFuture; diff --git a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java index 10a2128994..72a7deffe4 100644 --- a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java @@ -14,7 +14,7 @@ import akka.actor.typed.javadsl.Behaviors; import akka.event.Logging; import org.junit.Ignore; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.Arrays; import java.util.Collections; diff --git a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java index f1e3edf0b3..e2a28b56d1 100644 --- a/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java +++ b/akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java @@ -12,7 +12,7 @@ import akka.actor.testkit.typed.scaladsl.TestProbeSpec; import akka.actor.testkit.typed.scaladsl.TestProbeSpec.*; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import static org.junit.Assert.*; diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java b/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java index 689bf51053..70535de708 100644 --- a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java @@ -13,7 +13,7 @@ import akka.actor.testkit.typed.javadsl.ActorTestKit; import akka.actor.testkit.typed.javadsl.TestProbe; import org.junit.AfterClass; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.util.Success; import scala.util.Try; diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java b/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java index 9313065591..8969473668 100644 --- a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java @@ -10,7 +10,7 @@ import akka.actor.typed.Behavior; import akka.actor.testkit.typed.javadsl.ManualTime; import akka.actor.testkit.typed.javadsl.TestKitJunitResource; import org.junit.ClassRule; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.time.Duration; import akka.actor.typed.javadsl.Behaviors; diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java b/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java index 24321f3621..36e4efd11b 100644 --- a/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java +++ b/akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java @@ -18,7 +18,7 @@ import java.util.Optional; // #imports import org.junit.Test; import static org.junit.Assert.assertEquals; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class SyncTestingExampleTest extends JUnitSuite { diff --git a/akka-actor-tests/src/test/java/akka/actor/AbstractFSMActorTest.java b/akka-actor-tests/src/test/java/akka/actor/AbstractFSMActorTest.java index c0ece1d76e..e867fb99de 100644 --- a/akka-actor-tests/src/test/java/akka/actor/AbstractFSMActorTest.java +++ b/akka-actor-tests/src/test/java/akka/actor/AbstractFSMActorTest.java @@ -12,7 +12,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class AbstractFSMActorTest extends JUnitSuite { diff --git a/akka-actor-tests/src/test/java/akka/actor/ActorCreationTest.java b/akka-actor-tests/src/test/java/akka/actor/ActorCreationTest.java index 847dd0b645..b5c565dedb 100644 --- a/akka-actor-tests/src/test/java/akka/actor/ActorCreationTest.java +++ b/akka-actor-tests/src/test/java/akka/actor/ActorCreationTest.java @@ -17,7 +17,7 @@ import org.junit.Test; import akka.japi.Creator; import akka.japi.pf.ReceiveBuilder; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class ActorCreationTest extends JUnitSuite { diff --git a/akka-actor-tests/src/test/java/akka/actor/ActorSelectionTest.java b/akka-actor-tests/src/test/java/akka/actor/ActorSelectionTest.java index 8484ef3a06..dac34f7100 100644 --- a/akka-actor-tests/src/test/java/akka/actor/ActorSelectionTest.java +++ b/akka-actor-tests/src/test/java/akka/actor/ActorSelectionTest.java @@ -8,7 +8,7 @@ import akka.testkit.AkkaJUnitActorSystemResource; import akka.testkit.AkkaSpec; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.time.Duration; import java.util.concurrent.CompletionStage; diff --git a/akka-actor-tests/src/test/java/akka/actor/ActorSystemTest.java b/akka-actor-tests/src/test/java/akka/actor/ActorSystemTest.java index e10645f504..c503d4c94b 100644 --- a/akka-actor-tests/src/test/java/akka/actor/ActorSystemTest.java +++ b/akka-actor-tests/src/test/java/akka/actor/ActorSystemTest.java @@ -8,7 +8,7 @@ import akka.testkit.AkkaJUnitActorSystemResource; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.concurrent.CompletionStage; diff --git a/akka-actor-tests/src/test/java/akka/actor/InboxJavaAPITest.java b/akka-actor-tests/src/test/java/akka/actor/InboxJavaAPITest.java index 023caadf97..3976014f2d 100644 --- a/akka-actor-tests/src/test/java/akka/actor/InboxJavaAPITest.java +++ b/akka-actor-tests/src/test/java/akka/actor/InboxJavaAPITest.java @@ -10,7 +10,7 @@ import org.junit.ClassRule; import org.junit.Test; import akka.testkit.AkkaJUnitActorSystemResource; import akka.testkit.AkkaSpec; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class InboxJavaAPITest extends JUnitSuite { diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java index d605959b3e..99569ab9f7 100644 --- a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java +++ b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java @@ -20,7 +20,7 @@ import akka.testkit.TestProbe; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.Option; import java.util.Optional; diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java b/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java index 05f723e388..3040483ae3 100644 --- a/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java +++ b/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java @@ -8,7 +8,7 @@ import akka.testkit.AkkaJUnitActorSystemResource; import org.junit.*; import akka.testkit.AkkaSpec; import com.typesafe.config.ConfigFactory; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import static org.junit.Assert.*; diff --git a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java b/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java index 0abdb1382d..4932136178 100644 --- a/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java +++ b/akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java @@ -9,7 +9,7 @@ import akka.testkit.TestProbe; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class StashJavaAPI extends JUnitSuite { diff --git a/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java b/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java index bf21a41629..4a13689d61 100644 --- a/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java +++ b/akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java @@ -7,7 +7,7 @@ package akka.actor.setup; import akka.actor.setup.ActorSystemSetup; import akka.actor.setup.Setup; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.Optional; diff --git a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java index e9f494d007..30e44a7eb1 100644 --- a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java +++ b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java @@ -9,7 +9,7 @@ import akka.actor.ActorSystem; import akka.japi.*; import org.junit.ClassRule; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.Function1; import scala.concurrent.Await; import scala.concurrent.Future; diff --git a/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java b/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java index 0b67a41307..53e1271948 100644 --- a/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java +++ b/akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java @@ -18,7 +18,7 @@ import com.typesafe.config.ConfigFactory; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.*; import java.time.Duration; diff --git a/akka-actor-tests/src/test/java/akka/japi/JavaAPITestBase.java b/akka-actor-tests/src/test/java/akka/japi/JavaAPITestBase.java index 23e78db2c9..9b52a9aa1d 100644 --- a/akka-actor-tests/src/test/java/akka/japi/JavaAPITestBase.java +++ b/akka-actor-tests/src/test/java/akka/japi/JavaAPITestBase.java @@ -9,7 +9,7 @@ import akka.event.LoggingAdapter; import akka.event.NoLogging; import akka.serialization.JavaSerializer; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.concurrent.Callable; diff --git a/akka-actor-tests/src/test/java/akka/japi/MatchBuilderTest.java b/akka-actor-tests/src/test/java/akka/japi/MatchBuilderTest.java index cc688ab1cc..9090dc87a0 100644 --- a/akka-actor-tests/src/test/java/akka/japi/MatchBuilderTest.java +++ b/akka-actor-tests/src/test/java/akka/japi/MatchBuilderTest.java @@ -9,7 +9,7 @@ import akka.japi.pf.Match; import org.junit.Rule; import org.junit.rules.ExpectedException; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.MatchError; import static org.junit.Assert.*; diff --git a/akka-actor-tests/src/test/java/akka/japi/pf/PFBuilderTest.java b/akka-actor-tests/src/test/java/akka/japi/pf/PFBuilderTest.java index 121aa2557c..cf991f214c 100644 --- a/akka-actor-tests/src/test/java/akka/japi/pf/PFBuilderTest.java +++ b/akka-actor-tests/src/test/java/akka/japi/pf/PFBuilderTest.java @@ -5,7 +5,7 @@ package akka.japi.pf; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.PartialFunction; import static org.junit.Assert.*; diff --git a/akka-actor-tests/src/test/java/akka/japi/pf/ReceiveBuilderTest.java b/akka-actor-tests/src/test/java/akka/japi/pf/ReceiveBuilderTest.java index 571f37dfef..2fab28446c 100644 --- a/akka-actor-tests/src/test/java/akka/japi/pf/ReceiveBuilderTest.java +++ b/akka-actor-tests/src/test/java/akka/japi/pf/ReceiveBuilderTest.java @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.List; import org.junit.Test; import org.junit.Before; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import akka.actor.AbstractActor.Receive; diff --git a/akka-actor-tests/src/test/java/akka/pattern/CircuitBreakerTest.java b/akka-actor-tests/src/test/java/akka/pattern/CircuitBreakerTest.java index 6d0b6bee90..016ed629d9 100644 --- a/akka-actor-tests/src/test/java/akka/pattern/CircuitBreakerTest.java +++ b/akka-actor-tests/src/test/java/akka/pattern/CircuitBreakerTest.java @@ -10,7 +10,7 @@ import akka.testkit.AkkaSpec; import akka.util.JavaDurationConverters; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.compat.java8.FutureConverters; import scala.concurrent.Await; diff --git a/akka-actor-tests/src/test/java/akka/pattern/PatternsTest.java b/akka-actor-tests/src/test/java/akka/pattern/PatternsTest.java index e7aa572fc8..c9e33685ee 100644 --- a/akka-actor-tests/src/test/java/akka/pattern/PatternsTest.java +++ b/akka-actor-tests/src/test/java/akka/pattern/PatternsTest.java @@ -12,7 +12,7 @@ import akka.testkit.TestProbe; import akka.util.Timeout; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.Await; import scala.concurrent.ExecutionContext; import scala.concurrent.Future; diff --git a/akka-actor-tests/src/test/java/akka/util/ByteStringTest.java b/akka-actor-tests/src/test/java/akka/util/ByteStringTest.java index eec0675324..7325626d6a 100644 --- a/akka-actor-tests/src/test/java/akka/util/ByteStringTest.java +++ b/akka-actor-tests/src/test/java/akka/util/ByteStringTest.java @@ -5,7 +5,7 @@ package akka.util; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import static junit.framework.TestCase.assertEquals; diff --git a/akka-actor-tests/src/test/java/akka/util/JavaDuration.java b/akka-actor-tests/src/test/java/akka/util/JavaDuration.java index 934e62d393..50d6c43e24 100644 --- a/akka-actor-tests/src/test/java/akka/util/JavaDuration.java +++ b/akka-actor-tests/src/test/java/akka/util/JavaDuration.java @@ -5,7 +5,7 @@ package akka.util; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.duration.Duration; public class JavaDuration extends JUnitSuite { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala index f4db1b0d0d..751658d861 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala @@ -13,7 +13,7 @@ import scala.concurrent.Await import akka.pattern.ask import scala.concurrent.duration._ import org.scalatest.BeforeAndAfterEach -import org.scalatest.junit.JUnitSuiteLike +import org.scalatestplus.junit.JUnitSuiteLike object ActorWithStashSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala index a5f218cda1..26e0a1dd6a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala @@ -10,7 +10,7 @@ import akka.testkit.EventFilter import akka.testkit.TestKit._ import com.typesafe.config.ConfigFactory import org.scalatest.{ Matchers, WordSpec } -import org.scalatest.junit.JUnitSuiteLike +import org.scalatestplus.junit.JUnitSuiteLike import scala.util.control.NoStackTrace diff --git a/akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala b/akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala index 7f888650ef..5a602767e0 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala @@ -4,6 +4,6 @@ package akka.actor -import org.scalatest.junit.JUnitSuiteLike +import org.scalatestplus.junit.JUnitSuiteLike class JavaAPISpec extends JavaAPI with JUnitSuiteLike diff --git a/akka-actor-tests/src/test/scala/akka/japi/JavaAPITest.scala b/akka-actor-tests/src/test/scala/akka/japi/JavaAPITest.scala index 94380bd86d..35585ee59b 100644 --- a/akka-actor-tests/src/test/scala/akka/japi/JavaAPITest.scala +++ b/akka-actor-tests/src/test/scala/akka/japi/JavaAPITest.scala @@ -4,6 +4,6 @@ package akka.japi -import org.scalatest.junit.JUnitSuiteLike +import org.scalatestplus.junit.JUnitSuiteLike class JavaAPITest extends JavaAPITestBase with JUnitSuiteLike diff --git a/akka-actor-tests/src/test/scala/akka/util/JavaDurationSpec.scala b/akka-actor-tests/src/test/scala/akka/util/JavaDurationSpec.scala index 0339818c64..4baa7eeb2b 100644 --- a/akka-actor-tests/src/test/scala/akka/util/JavaDurationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/JavaDurationSpec.scala @@ -4,6 +4,6 @@ package akka.util -import org.scalatest.junit.JUnitSuiteLike +import org.scalatestplus.junit.JUnitSuiteLike class JavaDurationSpec extends JavaDuration with JUnitSuiteLike diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ActorSystemTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/ActorSystemTest.java index 0c07613ba6..497b12740f 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ActorSystemTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/ActorSystemTest.java @@ -6,7 +6,7 @@ package akka.actor.typed; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.concurrent.CompletionStage; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java index 40124f17cb..afaa4f37d9 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java @@ -8,7 +8,7 @@ import akka.actor.setup.ActorSystemSetup; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.function.Function; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java index e50f92f3f3..e08703fba4 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java @@ -12,7 +12,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import akka.util.Timeout; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.time.Duration; import java.util.concurrent.TimeUnit; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextPipeToSelfTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextPipeToSelfTest.java index 6242d84bfc..ecb4d2dedd 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextPipeToSelfTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextPipeToSelfTest.java @@ -11,7 +11,7 @@ import akka.actor.typed.Props; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java index 962f8b15b3..0716cd76da 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java @@ -13,7 +13,7 @@ import akka.testkit.CustomEventFilter; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.duration.FiniteDuration; import java.util.HashMap; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java index 878ca68c54..3e656be45e 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java @@ -6,7 +6,7 @@ package akka.actor.typed.javadsl; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.duration.FiniteDuration; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/BehaviorBuilderTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/BehaviorBuilderTest.java index ea0a8f0646..69211436af 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/BehaviorBuilderTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/BehaviorBuilderTest.java @@ -8,7 +8,7 @@ import akka.actor.testkit.typed.javadsl.TestKitJunitResource; import akka.actor.testkit.typed.javadsl.TestProbe; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import akka.actor.typed.Behavior; import akka.actor.typed.Terminated; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/InterceptTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/InterceptTest.java index 5adb78b4af..6b77778be2 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/InterceptTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/InterceptTest.java @@ -10,7 +10,7 @@ import akka.actor.typed.*; import akka.testkit.AkkaSpec; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class InterceptTest extends JUnitSuite { diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ReceiveBuilderTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ReceiveBuilderTest.java index 71c302870d..9528c84dd4 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ReceiveBuilderTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ReceiveBuilderTest.java @@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import akka.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import akka.actor.typed.Behavior; diff --git a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java index cb4f46fcb6..a5b5468936 100644 --- a/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java +++ b/akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java @@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit; import akka.Done; import akka.actor.testkit.typed.javadsl.TestKitJunitResource; import org.junit.ClassRule; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import org.junit.Test; import akka.actor.typed.*; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSampleTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSampleTest.java index c485d177ec..af40adc72b 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSampleTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSampleTest.java @@ -9,7 +9,7 @@ import akka.actor.typed.internal.adapter.ActorSystemAdapter; import akka.testkit.javadsl.EventFilter; import com.typesafe.config.ConfigFactory; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.concurrent.TimeUnit; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/DispatchersDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/DispatchersDocTest.java index 1d76d37e0e..89cc2ab114 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/DispatchersDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/DispatchersDocTest.java @@ -6,7 +6,7 @@ package jdocs.akka.typed; import akka.actor.typed.Behavior; import akka.actor.typed.javadsl.*; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import akka.actor.typed.DispatcherSelector; public class DispatchersDocTest { diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java index 8b8faa93ec..5dfda01031 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java @@ -11,7 +11,7 @@ import akka.actor.typed.Props; import akka.actor.typed.javadsl.*; import akka.actor.testkit.typed.javadsl.TestProbe; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.Await; import scala.concurrent.duration.FiniteDuration; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java index 8b250ce56b..a1183c3437 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java @@ -16,7 +16,7 @@ import akka.actor.testkit.typed.javadsl.TestKitJunitResource; import akka.actor.testkit.typed.javadsl.TestProbe; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingUntypedTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingUntypedTest.java index 7031cfb83b..76202a2ad3 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingUntypedTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingUntypedTest.java @@ -15,7 +15,7 @@ import akka.actor.typed.javadsl.Adapter; import akka.testkit.javadsl.TestKit; import akka.testkit.TestProbe; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.duration.Duration; import static akka.actor.typed.javadsl.Behaviors.same; diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/UntypedWatchingTypedTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/UntypedWatchingTypedTest.java index e32f905fb2..8dc23342d8 100644 --- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/UntypedWatchingTypedTest.java +++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/UntypedWatchingTypedTest.java @@ -16,7 +16,7 @@ import akka.actor.typed.javadsl.Adapter; import akka.testkit.TestProbe; import akka.testkit.javadsl.TestKit; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.duration.Duration; import static akka.actor.typed.javadsl.Behaviors.same; diff --git a/akka-camel/src/test/java/akka/camel/ConsumerJavaTest.java b/akka-camel/src/test/java/akka/camel/ConsumerJavaTest.java index 2597e0a913..cbafda28a2 100644 --- a/akka-camel/src/test/java/akka/camel/ConsumerJavaTest.java +++ b/akka-camel/src/test/java/akka/camel/ConsumerJavaTest.java @@ -9,7 +9,7 @@ import akka.testkit.AkkaSpec; import akka.testkit.javadsl.EventFilter; import akka.testkit.javadsl.TestKit; import org.junit.ClassRule; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import akka.actor.ActorSystem; import akka.actor.Props; import akka.util.Timeout; diff --git a/akka-camel/src/test/java/akka/camel/CustomRouteTest.java b/akka-camel/src/test/java/akka/camel/CustomRouteTest.java index 66f5bd7496..9f8c836139 100644 --- a/akka-camel/src/test/java/akka/camel/CustomRouteTest.java +++ b/akka-camel/src/test/java/akka/camel/CustomRouteTest.java @@ -11,7 +11,7 @@ import akka.camel.javaapi.UntypedProducerActor; import akka.testkit.AkkaJUnitActorSystemResource; import akka.util.Timeout; import org.junit.*; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.Await; import scala.concurrent.ExecutionContext; import scala.concurrent.duration.Duration; diff --git a/akka-camel/src/test/java/akka/camel/MessageJavaTest.java b/akka-camel/src/test/java/akka/camel/MessageJavaTest.java index 5e3204c0f5..48c80d0566 100644 --- a/akka-camel/src/test/java/akka/camel/MessageJavaTest.java +++ b/akka-camel/src/test/java/akka/camel/MessageJavaTest.java @@ -11,7 +11,7 @@ import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.converter.stream.InputStreamCache; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.io.InputStream; import java.util.*; diff --git a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java b/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java index 9296cfafda..78d358ac88 100644 --- a/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java +++ b/akka-cluster-sharding-typed/src/test/java/akka/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java @@ -19,7 +19,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.concurrent.CompletionStage; diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java b/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java index beb9321bac..b7d37e25de 100644 --- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java +++ b/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java @@ -15,7 +15,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import static jdocs.akka.cluster.sharding.typed.HelloWorldPersistentEntityExample.*; import static org.junit.Assert.assertEquals; diff --git a/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java b/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java index c99e91b94c..694542cf13 100644 --- a/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java +++ b/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java @@ -13,7 +13,7 @@ import org.junit.ClassRule; import org.junit.Test; import akka.testkit.AkkaJUnitActorSystemResource; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class ClusterClientTest extends JUnitSuite { diff --git a/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java b/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java index c93bf686b5..a9ae1235d1 100644 --- a/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java +++ b/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java @@ -17,7 +17,7 @@ import akka.actor.Props; import akka.actor.AbstractActor; import akka.event.Logging; import akka.event.LoggingAdapter; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class DistributedPubSubMediatorTest extends JUnitSuite { diff --git a/akka-cluster-typed/src/test/java/akka/cluster/ddata/typed/javadsl/ReplicatorTest.java b/akka-cluster-typed/src/test/java/akka/cluster/ddata/typed/javadsl/ReplicatorTest.java index d3f670e896..62cafb7630 100644 --- a/akka-cluster-typed/src/test/java/akka/cluster/ddata/typed/javadsl/ReplicatorTest.java +++ b/akka-cluster-typed/src/test/java/akka/cluster/ddata/typed/javadsl/ReplicatorTest.java @@ -9,7 +9,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; // #sample import java.util.Optional; diff --git a/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java b/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java index 88d0be86cf..bc7ec11673 100644 --- a/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java +++ b/akka-cluster-typed/src/test/java/akka/cluster/typed/ClusterApiTest.java @@ -10,7 +10,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.Await; import scala.concurrent.duration.Duration; diff --git a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExampleTest.java b/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExampleTest.java index 0789b9a828..e460ed85c0 100644 --- a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExampleTest.java +++ b/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/ReceptionistExampleTest.java @@ -18,7 +18,7 @@ import akka.cluster.ClusterEvent; import akka.cluster.typed.Cluster; import akka.cluster.typed.Subscribe; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.Await; import scala.concurrent.duration.Duration; diff --git a/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java b/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java index 5cd10b689e..1be4ce1b2a 100644 --- a/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java +++ b/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java @@ -12,7 +12,7 @@ import akka.testkit.AkkaJUnitActorSystemResource; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.duration.Duration; import akka.testkit.TestProbe; diff --git a/akka-contrib/src/test/java/akka/contrib/throttle/TimerBasedThrottlerTest.java b/akka-contrib/src/test/java/akka/contrib/throttle/TimerBasedThrottlerTest.java index d9caa59bfb..786fe88b82 100644 --- a/akka-contrib/src/test/java/akka/contrib/throttle/TimerBasedThrottlerTest.java +++ b/akka-contrib/src/test/java/akka/contrib/throttle/TimerBasedThrottlerTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import java.util.concurrent.TimeUnit; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.duration.Duration; import com.typesafe.config.ConfigFactory; import akka.actor.ActorRef; diff --git a/akka-docs/src/test/java/jdocs/AbstractJavaTest.java b/akka-docs/src/test/java/jdocs/AbstractJavaTest.java index 989bdd2bb4..cb5433f281 100644 --- a/akka-docs/src/test/java/jdocs/AbstractJavaTest.java +++ b/akka-docs/src/test/java/jdocs/AbstractJavaTest.java @@ -4,7 +4,7 @@ package jdocs; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; /** Base class for all runnable example tests written in Java */ public abstract class AbstractJavaTest extends JUnitSuite {} diff --git a/akka-docs/src/test/java/jdocs/tutorial_1/ActorHierarchyExperiments.java b/akka-docs/src/test/java/jdocs/tutorial_1/ActorHierarchyExperiments.java index 327643d645..45c1a5c22e 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_1/ActorHierarchyExperiments.java +++ b/akka-docs/src/test/java/jdocs/tutorial_1/ActorHierarchyExperiments.java @@ -11,7 +11,7 @@ import akka.testkit.javadsl.TestKit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; // #print-refs import akka.actor.AbstractActor; diff --git a/akka-docs/src/test/java/jdocs/tutorial_3/DeviceTest.java b/akka-docs/src/test/java/jdocs/tutorial_3/DeviceTest.java index db2899a4dc..0a98aaa9c5 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_3/DeviceTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_3/DeviceTest.java @@ -11,7 +11,7 @@ import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.assertEquals; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import akka.actor.ActorSystem; import akka.actor.ActorRef; diff --git a/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java index b89b37ecf3..d5a09d1860 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java @@ -18,7 +18,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class DeviceGroupTest extends JUnitSuite { diff --git a/akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java index 7f2550d1e5..ad86a1d8f8 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java @@ -13,7 +13,7 @@ import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.assertEquals; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.Optional; diff --git a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupQueryTest.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupQueryTest.java index 622bbe8f0e..d0bd463264 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupQueryTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupQueryTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.concurrent.duration.FiniteDuration; import java.util.HashMap; diff --git a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java index e9a0498a2f..c1e01efa2a 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class DeviceGroupTest extends JUnitSuite { diff --git a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java index bb02661683..312738963d 100644 --- a/akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java +++ b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java @@ -15,7 +15,7 @@ import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.assertEquals; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class DeviceTest extends JUnitSuite { diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java b/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java index 291e289a73..4e52df2da9 100644 --- a/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java +++ b/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java @@ -8,7 +8,7 @@ import akka.actor.typed.PreRestart; import akka.actor.typed.SupervisorStrategy; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import akka.actor.testkit.typed.javadsl.TestKitJunitResource; import akka.actor.typed.PostStop; diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java index 1e224e2c01..35701a5510 100644 --- a/akka-docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java +++ b/akka-docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java @@ -23,7 +23,7 @@ import static com.lightbend.akka.sample.DeviceProtocol.*; public class DeviceTest { //#device-read-test */ -public class DeviceTest extends org.scalatest.junit.JUnitSuite { +public class DeviceTest extends org.scalatestplus.junit.JUnitSuite { // #device-read-test @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource(); diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java index 48cab29d19..3da8170323 100644 --- a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java +++ b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java @@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import akka.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java index e395e93538..05bacfa46c 100644 --- a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java +++ b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java @@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import akka.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import static jdocs.typed.tutorial_4.DeviceManagerProtocol.*; import static org.junit.Assert.assertNotEquals; diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java index ccbd967e92..7f546e865b 100644 --- a/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java +++ b/akka-docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java @@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import akka.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.Optional; diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java index d7c617b4f1..0d27e9b089 100644 --- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java +++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java @@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import akka.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.time.Duration; import java.util.HashMap; diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java index 15df4ed7dc..c08c3cd4d7 100644 --- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java +++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java @@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import akka.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.HashMap; import java.util.Map; diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java index 56143b1e64..73fecded96 100644 --- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java +++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java @@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import akka.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import static jdocs.typed.tutorial_5.DeviceManagerProtocol.*; import static org.junit.Assert.assertNotEquals; diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java index 81d388adf3..c73035d4d1 100644 --- a/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java +++ b/akka-docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java @@ -9,7 +9,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe; import akka.actor.typed.ActorRef; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.util.Optional; diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/EventSourcedActorFailureTest.java b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/EventSourcedActorFailureTest.java index 1c1f1e501a..63c4d5fa39 100644 --- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/EventSourcedActorFailureTest.java +++ b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/EventSourcedActorFailureTest.java @@ -15,7 +15,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import java.time.Duration; diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java index 6f54db0236..7afc6c6734 100644 --- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java +++ b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java @@ -14,7 +14,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class NullEmptyStateTest extends JUnitSuite { diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java index 5eb10ae601..46738c8c7c 100644 --- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java +++ b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java @@ -32,7 +32,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import scala.Function0; import java.io.Serializable; diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PrimitiveStateTest.java b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PrimitiveStateTest.java index 0ee10c636c..545f14a7ee 100644 --- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PrimitiveStateTest.java +++ b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PrimitiveStateTest.java @@ -14,7 +14,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; public class PrimitiveStateTest extends JUnitSuite { diff --git a/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java b/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java index 7cc77580ee..ac3a9976f1 100644 --- a/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java +++ b/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java @@ -21,7 +21,7 @@ import java.time.Duration; import akka.persistence.fsm.PersistentFSM.CurrentState; import org.junit.Test; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import static akka.persistence.fsm.PersistentFSM.FSMState; diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala index 85c17da298..9e5b56f545 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala @@ -11,7 +11,7 @@ import akka.stream.testkit.TestPublisher import org.reactivestreams.{ Subscriber, Subscription, Processor, Publisher } import org.reactivestreams.tck.IdentityProcessorVerification import org.reactivestreams.tck.TestEnvironment -import org.scalatest.testng.TestNGSuiteLike +import org.scalatestplus.testng.TestNGSuiteLike import org.testng.annotations.AfterClass abstract class AkkaIdentityProcessorVerification[T](env: TestEnvironment, publisherShutdownTimeout: Long) diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala index d5ed99c836..c3f1d99413 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala @@ -10,7 +10,7 @@ import akka.stream.ActorMaterializer import akka.stream.testkit.TestPublisher import org.reactivestreams.Publisher import org.reactivestreams.tck.{ PublisherVerification, TestEnvironment } -import org.scalatest.testng.TestNGSuiteLike +import org.scalatestplus.testng.TestNGSuiteLike abstract class AkkaPublisherVerification[T](val env: TestEnvironment, publisherShutdownTimeout: Long) extends PublisherVerification[T](env, publisherShutdownTimeout) diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala index ee523e049e..563e6d209e 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala @@ -10,7 +10,7 @@ import akka.stream.ActorMaterializer import org.reactivestreams.tck.SubscriberBlackboxVerification import org.reactivestreams.tck.SubscriberWhiteboxVerification import org.reactivestreams.tck.TestEnvironment -import org.scalatest.testng.TestNGSuiteLike +import org.scalatestplus.testng.TestNGSuiteLike abstract class AkkaSubscriberBlackboxVerification[T](env: TestEnvironment) extends SubscriberBlackboxVerification[T](env) with TestNGSuiteLike diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SinkholeSubscriberTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SinkholeSubscriberTest.scala index e4eaf37271..8c0a0f4b41 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SinkholeSubscriberTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SinkholeSubscriberTest.scala @@ -8,7 +8,7 @@ import akka.Done import akka.stream.impl.SinkholeSubscriber import org.reactivestreams.tck.{ TestEnvironment, SubscriberWhiteboxVerification } import org.reactivestreams.tck.SubscriberWhiteboxVerification.{ SubscriberPuppet, WhiteboxSubscriberProbe } -import org.scalatest.testng.{ TestNGSuiteLike } +import org.scalatestplus.testng.{ TestNGSuiteLike } import java.lang.{ Integer ⇒ JInt } import scala.concurrent.Promise import org.reactivestreams.{ Subscription, Subscriber } diff --git a/akka-stream-tests/src/test/java/akka/stream/StreamTest.java b/akka-stream-tests/src/test/java/akka/stream/StreamTest.java index 9cee0fdaeb..3fbcd80c0e 100644 --- a/akka-stream-tests/src/test/java/akka/stream/StreamTest.java +++ b/akka-stream-tests/src/test/java/akka/stream/StreamTest.java @@ -7,7 +7,7 @@ package akka.stream; import akka.stream.testkit.javadsl.StreamTestKit; import org.junit.After; import org.junit.Before; -import org.scalatest.junit.JUnitSuite; +import org.scalatestplus.junit.JUnitSuite; import akka.actor.ActorSystem; import akka.testkit.AkkaJUnitActorSystemResource; diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e25b95095d..191360ab3d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,7 +29,7 @@ object Dependencies { case Some((2, n)) if n >= 12 ⇒ "1.14.0" // does not work for 2.11 case _ ⇒ "1.13.2" }), - scalaTestVersion := "3.0.6-SNAP5", + scalaTestVersion := "3.0.6-SNAP6", java8CompatVersion := { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, n)) if n >= 13 ⇒ "0.9.0"