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 4dea80aa2d..14aa41ef6e 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 72a7deffe4..10a2128994 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 e2a28b56d1..f1e3edf0b3 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 70535de708..689bf51053 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 8969473668..9313065591 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 36e4efd11b..24321f3621 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 e867fb99de..c0ece1d76e 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 b5c565dedb..847dd0b645 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 dac34f7100..8484ef3a06 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 c503d4c94b..e10645f504 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 3976014f2d..023caadf97 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 99569ab9f7..d605959b3e 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 3040483ae3..05f723e388 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 4932136178..0abdb1382d 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 4a13689d61..bf21a41629 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 30e44a7eb1..e9f494d007 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 53e1271948..0b67a41307 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 9b52a9aa1d..23e78db2c9 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 9090dc87a0..cc688ab1cc 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 cf991f214c..121aa2557c 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 2fab28446c..571f37dfef 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 016ed629d9..6d0b6bee90 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 294aca93a5..870f155a80 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 7325626d6a..eec0675324 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 50d6c43e24..934e62d393 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 133e1de67d..889637e215 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.scalatestplus.junit.JUnitSuiteLike +import org.scalatest.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 608d08462c..b4eb402d62 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.scalatestplus.junit.JUnitSuiteLike +import org.scalatest.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 5a602767e0..7f888650ef 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.scalatestplus.junit.JUnitSuiteLike +import org.scalatest.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 35585ee59b..94380bd86d 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.scalatestplus.junit.JUnitSuiteLike +import org.scalatest.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 4baa7eeb2b..0339818c64 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.scalatestplus.junit.JUnitSuiteLike +import org.scalatest.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 497b12740f..0c07613ba6 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 afaa4f37d9..40124f17cb 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 e08703fba4..e50f92f3f3 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 ecb4d2dedd..6242d84bfc 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 0716cd76da..962f8b15b3 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 3e656be45e..878ca68c54 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 69211436af..ea0a8f0646 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 6b77778be2..5adb78b4af 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 9528c84dd4..71c302870d 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 a5b5468936..cb4f46fcb6 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 af40adc72b..c485d177ec 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 89cc2ab114..1d76d37e0e 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 5dfda01031..8b8faa93ec 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 a1183c3437..8b250ce56b 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 76202a2ad3..7031cfb83b 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 8dc23342d8..e32f905fb2 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 cbafda28a2..2597e0a913 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 9f8c836139..66f5bd7496 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 48c80d0566..5e3204c0f5 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 78d358ac88..9296cfafda 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 b7d37e25de..beb9321bac 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 694542cf13..c99e91b94c 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 a9ae1235d1..c93bf686b5 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 62cafb7630..d3f670e896 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 bc7ec11673..88d0be86cf 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 e460ed85c0..0789b9a828 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 1be4ce1b2a..5cd10b689e 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 786fe88b82..d9caa59bfb 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 cb5433f281..989bdd2bb4 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 45c1a5c22e..327643d645 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 0a98aaa9c5..db2899a4dc 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 d5a09d1860..b89b37ecf3 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 ad86a1d8f8..7f2550d1e5 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 d0bd463264..622bbe8f0e 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 c1e01efa2a..e9a0498a2f 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 312738963d..bb02661683 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 4e52df2da9..291e289a73 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 35701a5510..1e224e2c01 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.scalatestplus.junit.JUnitSuite { +public class DeviceTest extends org.scalatest.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 3da8170323..48cab29d19 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 05bacfa46c..e395e93538 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 7f546e865b..ccbd967e92 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 0d27e9b089..d7c617b4f1 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 c08c3cd4d7..15df4ed7dc 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 73fecded96..56143b1e64 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 c73035d4d1..81d388adf3 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 ec50543547..2840461b63 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 @@ -19,7 +19,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 f215a284f1..658e5c917f 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 @@ -15,7 +15,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 5e89bf088c..49e4dfe62d 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 @@ -29,7 +29,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 322db5625d..9288d21099 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 @@ -15,7 +15,7 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.junit.ClassRule; import org.junit.Test; -import org.scalatestplus.junit.JUnitSuite; +import org.scalatest.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 ac3a9976f1..7cc77580ee 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.junit.JUnitSuite; import static akka.persistence.fsm.PersistentFSM.FSMState; 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 3fbcd80c0e..9cee0fdaeb 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.scalatestplus.junit.JUnitSuite; +import org.scalatest.junit.JUnitSuite; import akka.actor.ActorSystem; import akka.testkit.AkkaJUnitActorSystemResource; diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 64af9e389d..12aee07fad 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-SNAP6", + scalaTestVersion := "3.0.7", java8CompatVersion := { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, n)) if n >= 13 => "0.9.0"