raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Update to ScalaTest 3.1.0, fix #28289.

Browse source
This commit is contained in:
Mike Limansky 2020-01-11 15:14:21 +03:00
parent 4749b11be8
commit d9ed927df0
305 changed files with 702 additions and 656 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala
View file

@ -7,10 +7,11 @@ package akka.actor.testkit.typed.scaladsl
import akka.actor.testkit.typed.TestKitSettings
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.scalatest._
import org.scalatest.{ BeforeAndAfterAll, TestSuite }
import org.scalatest.concurrent.Eventually
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.time.Span
import org.scalatest.matchers.should.Matchers
/**
* A ScalaTest base class for the [[ActorTestKit]], making it possible to have ScalaTest manage the lifecycle of the testkit.

2
akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/ActorTestKitTest.java
View file

@ -9,7 +9,7 @@ import akka.actor.typed.javadsl.Behaviors;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.util.HashMap;
import java.util.concurrent.CompletableFuture;

5
akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/BehaviorTestKitTest.java
View file

@ -13,15 +13,12 @@ import akka.actor.typed.Props;
import akka.actor.typed.javadsl.Behaviors;
import org.junit.Ignore;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import org.slf4j.event.Level;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.IntStream;
import static org.junit.Assert.assertEquals;

2
akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/LoggingTestKitTest.java
View file

@ -9,7 +9,7 @@ import akka.actor.testkit.typed.TestException;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import org.slf4j.event.Level;
import java.util.Collections;

2
akka-actor-testkit-typed/src/test/java/akka/actor/testkit/typed/javadsl/TestProbeTest.java
View file

@ -13,7 +13,7 @@ import akka.actor.testkit.typed.scaladsl.TestProbeSpec.*;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import static org.junit.Assert.*;

2
akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java
View file

@ -16,7 +16,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 java.time.Duration;
import java.util.concurrent.CompletionStage;

2
akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/ManualTimerExampleTest.java
View file

@ -12,7 +12,7 @@ import akka.actor.testkit.typed.javadsl.ManualTime;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import org.junit.ClassRule;
import org.junit.Rule;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.time.Duration;
import akka.actor.typed.javadsl.Behaviors;

3
akka-actor-testkit-typed/src/test/java/jdocs/akka/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
View file

@ -8,7 +8,6 @@ package jdocs.akka.actor.testkit.typed.javadsl;
import akka.actor.testkit.typed.CapturedLogEvent;
import akka.actor.testkit.typed.Effect;
import akka.actor.testkit.typed.javadsl.BehaviorTestKit;
import akka.actor.testkit.typed.javadsl.Effects;
import akka.actor.testkit.typed.javadsl.TestInbox;
import akka.actor.typed.*;
import akka.actor.typed.javadsl.*;
@ -19,7 +18,7 @@ import org.slf4j.event.Level;
// #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 {

11
akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
View file

@ -10,11 +10,10 @@ import scala.concurrent.Promise
import akka.actor.typed.scaladsl.Behaviors
import com.typesafe.config.ConfigFactory
import org.scalatest.BeforeAndAfterAll
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.WordSpecLike
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
class ActorTestKitSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class ActorTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
"the Scala testkit" should {
@ -91,7 +90,7 @@ class ActorTestKitSpec extends ScalaTestWithActorTestKit with WordSpecLike with
}
// derivative classes should also work fine (esp the naming part
abstract class MyBaseSpec extends ScalaTestWithActorTestKit with Matchers with WordSpecLike with LogCapturing
abstract class MyBaseSpec extends ScalaTestWithActorTestKit with Matchers with AnyWordSpecLike with LogCapturing
class MyConcreteDerivateSpec extends MyBaseSpec {
"A derivative test" should {
@ -116,7 +115,7 @@ class MyConcreteDerivateSpec extends MyBaseSpec {
}
class CompositionSpec extends WordSpec with Matchers with BeforeAndAfterAll with LogCapturing {
class CompositionSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll with LogCapturing {
val testKit = ActorTestKit()
override def afterAll(): Unit = {

5
akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
View file

@ -12,10 +12,11 @@ import akka.actor.testkit.typed.{ CapturedLogEvent, Effect }
import akka.actor.testkit.typed.Effect._
import akka.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.{ Child, Parent }
import akka.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.Parent._
import org.scalatest.{ Matchers, WordSpec }
import scala.reflect.ClassTag
import org.slf4j.event.Level
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
object BehaviorTestKitSpec {
object Parent {
@ -122,7 +123,7 @@ object BehaviorTestKitSpec {
}
class BehaviorTestKitSpec extends WordSpec with Matchers with LogCapturing {
class BehaviorTestKitSpec extends AnyWordSpec with Matchers with LogCapturing {
private val props = Props.empty.withDispatcherFromConfig("cat")

4
akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala
View file

@ -5,10 +5,10 @@
package akka.actor.testkit.typed.scaladsl
import akka.actor.testkit.typed.LoggingEvent
import org.scalatest.WordSpecLike
import org.slf4j.event.Level
import org.scalatest.wordspec.AnyWordSpecLike
class LoggingTestKitSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class LoggingTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
private class AnError extends Exception
private def errorNoCause =

4
akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala
View file

@ -9,8 +9,8 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.Future
import akka.actor.testkit.typed.TestException
import org.scalatest.WordSpecLike
import org.slf4j.LoggerFactory
import org.scalatest.wordspec.AnyWordSpecLike
class TestAppenderSpec
extends ScalaTestWithActorTestKit(
@ -18,7 +18,7 @@ class TestAppenderSpec
# increase to avoid spurious failures in "find unexpected async events withOccurrences(0)"
akka.actor.testkit.typed.expect-no-message-default = 1000 ms
""")
with WordSpecLike
with AnyWordSpecLike
with LogCapturing {
class AnotherLoggerClass

6
akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala
View file

@ -8,9 +8,9 @@ import akka.actor.typed.scaladsl.Behaviors
import com.typesafe.config.ConfigFactory
import scala.concurrent.duration._
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
class TestProbeSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class TestProbeSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
import TestProbeSpec._
@ -183,7 +183,7 @@ object TestProbeSpec {
class TestProbeTimeoutSpec
extends ScalaTestWithActorTestKit(TestProbeSpec.timeoutConfig)
with WordSpecLike
with AnyWordSpecLike
with LogCapturing {
import TestProbeSpec._

6
akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala
View file

@ -16,8 +16,8 @@ import akka.actor.typed.scaladsl.Behaviors
import akka.util.Timeout
//#test-header
import org.scalatest.BeforeAndAfterAll
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
//#test-header
import scala.concurrent.duration._
@ -60,7 +60,7 @@ object AsyncTestingExampleSpec {
//#test-header
class AsyncTestingExampleSpec
extends WordSpec
extends AnyWordSpec
with BeforeAndAfterAll
//#test-header
with LogCapturing

8
akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala
View file

@ -6,15 +6,17 @@ package docs.akka.actor.testkit.typed.scaladsl
//#manual-scheduling-simple
import scala.concurrent.duration._
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import akka.actor.testkit.typed.scaladsl.ManualTime
import akka.actor.testkit.typed.scaladsl.TestProbe
import akka.actor.testkit.typed.scaladsl.LogCapturing
import akka.actor.typed.scaladsl.Behaviors
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
class ManualTimerExampleSpec extends ScalaTestWithActorTestKit(ManualTime.config) with WordSpecLike with LogCapturing {
class ManualTimerExampleSpec
extends ScalaTestWithActorTestKit(ManualTime.config)
with AnyWordSpecLike
with LogCapturing {
val manualTime: ManualTime = ManualTime()

6
akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala
View file

@ -11,14 +11,14 @@ import docs.akka.actor.testkit.typed.scaladsl.AsyncTestingExampleSpec.Echo
import akka.actor.testkit.typed.scaladsl.LogCapturing
//#scalatest-integration
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
//#scalatest-integration
//#log-capturing
@silent
//#scalatest-integration
class ScalaTestIntegrationExampleSpec extends ScalaTestWithActorTestKit with WordSpecLike {
class ScalaTestIntegrationExampleSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
"Something" must {
"behave correctly" in {
@ -32,7 +32,7 @@ class ScalaTestIntegrationExampleSpec extends ScalaTestWithActorTestKit with Wor
//#scalatest-integration
//#log-capturing
class LogCapturingExampleSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class LogCapturingExampleSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
"Something" must {
"behave correctly" in {

6
akka-actor-testkit-typed/src/test/scala/docs/akka/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala
View file

@ -13,8 +13,8 @@ import akka.actor.typed._
import akka.actor.typed.scaladsl._
import org.slf4j.event.Level
//#imports
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
object SyncTestingExampleSpec {
//#child
@ -61,7 +61,7 @@ object SyncTestingExampleSpec {
}
class SyncTestingExampleSpec extends WordSpec with Matchers {
class SyncTestingExampleSpec extends AnyWordSpec with Matchers {
import SyncTestingExampleSpec._

5
akka-actor-tests/src/test/java/akka/actor/AbstractFSMActorTest.java
View file

@ -7,12 +7,9 @@ package akka.actor;
import akka.testkit.AkkaJUnitActorSystemResource;
import akka.testkit.AkkaSpec;
import akka.testkit.TestProbe;
import akka.testkit.javadsl.TestKit;
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 {

6
akka-actor-tests/src/test/java/akka/actor/ActorCreationTest.java
View file

@ -10,14 +10,10 @@ import static java.util.stream.Collectors.toCollection;
import java.util.ArrayList;
import java.util.stream.IntStream;
import akka.testkit.TestActors;
import org.junit.Assert;
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 {

3
akka-actor-tests/src/test/java/akka/actor/ActorSelectionTest.java
View file

@ -8,7 +8,8 @@ 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;

2
akka-actor-tests/src/test/java/akka/actor/ActorSystemTest.java
View file

@ -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;

2
akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
View file

@ -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;

2
akka-actor-tests/src/test/java/akka/actor/JavaExtension.java
View file

@ -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.*;

2
akka-actor-tests/src/test/java/akka/actor/StashJavaAPI.java
View file

@ -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 {

4
akka-actor-tests/src/test/java/akka/actor/setup/ActorSystemSetupTest.java
View file

@ -4,10 +4,8 @@
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;

4
akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
View file

@ -9,8 +9,7 @@ import akka.actor.ActorSystem;
import akka.japi.*;
import org.junit.ClassRule;
import org.scalatest.junit.JUnitSuite;
import scala.Function1;
import org.scalatestplus.junit.JUnitSuite;
import scala.concurrent.Await;
import scala.concurrent.Future;
import scala.concurrent.Promise;
@ -27,7 +26,6 @@ import java.util.concurrent.TimeUnit;
import static akka.japi.Util.classTag;
import akka.testkit.AkkaSpec;
import scala.util.Try;
public class JavaFutureTests extends JUnitSuite {

2
akka-actor-tests/src/test/java/akka/event/LoggingAdapterTest.java
View file

@ -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;

2
akka-actor-tests/src/test/java/akka/japi/JavaAPITestBase.java
View file

@ -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;

2
akka-actor-tests/src/test/java/akka/japi/MatchBuilderTest.java
View file

@ -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.*;

2
akka-actor-tests/src/test/java/akka/japi/pf/PFBuilderTest.java
View file

@ -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.*;

2
akka-actor-tests/src/test/java/akka/japi/pf/ReceiveBuilderTest.java
View file

@ -8,9 +8,9 @@ import java.util.Arrays;
import java.util.List;
import org.junit.Test;
import org.junit.Before;
import org.scalatest.junit.JUnitSuite;
import akka.actor.AbstractActor.Receive;
import org.scalatestplus.junit.JUnitSuite;
import static org.junit.Assert.*;

2
akka-actor-tests/src/test/java/akka/pattern/CircuitBreakerTest.java
View file

@ -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;

2
akka-actor-tests/src/test/java/akka/pattern/PatternsTest.java
View file

@ -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;

2
akka-actor-tests/src/test/java/akka/util/ByteStringTest.java
View file

@ -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;

2
akka-actor-tests/src/test/java/akka/util/JavaDuration.java
View file

@ -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 {

6
akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala
View file

@ -5,15 +5,15 @@
package akka
import akka.actor._
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
/**
* A spec that verified that the AkkaException has at least a single argument constructor of type String.
*
* This is required to make Akka Exceptions be friends with serialization/deserialization.
*/
class AkkaExceptionSpec extends WordSpec with Matchers {
class AkkaExceptionSpec extends AnyWordSpec with Matchers {
"AkkaException" must {
"have a AkkaException(String msg) constructor to be serialization friendly" in {

5
akka-actor-tests/src/test/scala/akka/AkkaVersionSpec.scala
View file

@ -4,9 +4,10 @@
package akka
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class AkkaVersionSpec extends WordSpec with Matchers {
class AkkaVersionSpec extends AnyWordSpec with Matchers {
"The Akka version check" must {

5
akka-actor-tests/src/test/scala/akka/actor/ActorPathSpec.scala
View file

@ -6,9 +6,10 @@ package akka.actor
import java.net.MalformedURLException
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class ActorPathSpec extends WordSpec with Matchers {
class ActorPathSpec extends AnyWordSpec with Matchers {
"An ActorPath" must {

2
akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala
View file

@ -15,7 +15,7 @@ import com.github.ghik.silencer.silent
import scala.concurrent.duration._
import org.scalatest.BeforeAndAfterEach
import org.scalatest.junit.JUnitSuiteLike
import org.scalatestplus.junit.JUnitSuiteLike
object ActorWithStashSpec {

6
akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala
View file

@ -4,7 +4,9 @@
package akka.actor
import org.scalatest._
import org.scalatest.BeforeAndAfterAll
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
import scala.collection.immutable
import scala.concurrent.Await
@ -20,7 +22,7 @@ class TestClassWithDefaultConstructor extends TestSuperclass {
override def name = "default"
}
class DynamicAccessSpec extends WordSpec with Matchers with BeforeAndAfterAll {
class DynamicAccessSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll {
val system = ActorSystem()
"The DynamicAccess of a system" should {

8
akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala
View file

@ -9,12 +9,12 @@ import java.util.concurrent.atomic.AtomicInteger
import akka.testkit.EventFilter
import akka.testkit.TestKit._
import com.typesafe.config.ConfigFactory
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.junit.JUnitSuiteLike
import scala.util.control.NoStackTrace
import com.github.ghik.silencer.silent
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
import org.scalatestplus.junit.JUnitSuiteLike
@silent
class JavaExtensionSpec extends JavaExtension with JUnitSuiteLike
@ -54,7 +54,7 @@ class FailingTestExtension(val system: ExtendedActorSystem) extends Extension {
throw new FailingTestExtension.TestException
}
class ExtensionSpec extends WordSpec with Matchers {
class ExtensionSpec extends AnyWordSpec with Matchers {
"The ActorSystem extensions support" should {

4
akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala
View file

@ -4,8 +4,8 @@
package akka.actor
import org.scalatest.junit.JUnitSuiteLike
import com.github.ghik.silencer.silent
import org.scalatestplus.junit.JUnitSuiteLike
@silent
class JavaAPISpec extends JavaAPI with JUnitSuiteLike

6
akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala
View file

@ -4,12 +4,12 @@
package akka.actor
import org.scalatest.WordSpec
import org.scalatest.Matchers
import java.net.URLEncoder
import scala.collection.immutable
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class RelativeActorPathSpec extends WordSpec with Matchers {
class RelativeActorPathSpec extends AnyWordSpec with Matchers {
def elements(path: String): immutable.Seq[String] = RelativeActorPath.unapply(path).getOrElse(Nil)

5
akka-actor-tests/src/test/scala/akka/actor/setup/ActorSystemSetupSpec.scala
View file

@ -6,13 +6,14 @@ package akka.actor.setup
import akka.actor.ActorSystem
import akka.testkit.TestKit
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
case class DummySetup(name: String) extends Setup
case class DummySetup2(name: String) extends Setup
case class DummySetup3(name: String) extends Setup
class ActorSystemSetupSpec extends WordSpec with Matchers {
class ActorSystemSetupSpec extends AnyWordSpec with Matchers {
"The ActorSystemSettings" should {

5
akka-actor-tests/src/test/scala/akka/dispatch/DispatcherShutdownSpec.scala
View file

@ -7,11 +7,12 @@ package akka.dispatch
import akka.actor.ActorSystem
import akka.testkit.TestKit
import java.lang.management.ManagementFactory
import org.scalatest.{ Matchers, WordSpec }
import scala.concurrent.{ Await, Future }
import scala.concurrent.duration._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class DispatcherShutdownSpec extends WordSpec with Matchers {
class DispatcherShutdownSpec extends AnyWordSpec with Matchers {
"akka dispatcher" should {

6
akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala
View file

@ -13,8 +13,8 @@ import akka.actor._
import java.nio.charset.StandardCharsets
import java.util.{ Calendar, Date, GregorianCalendar, TimeZone }
import org.scalatest.WordSpec
import org.scalatest.Matchers
import org.scalatest.wordspec.AnyWordSpec
import org.scalatest.matchers.should.Matchers
import akka.serialization.SerializationExtension
import akka.event.Logging._
import akka.util.Helpers
@ -139,7 +139,7 @@ object LoggerSpec {
}
class LoggerSpec extends WordSpec with Matchers {
class LoggerSpec extends AnyWordSpec with Matchers {
import LoggerSpec._

4
akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala
View file

@ -9,7 +9,7 @@ import language.postfixOps
import org.scalatest.BeforeAndAfterAll
import scala.concurrent.duration._
import akka.testkit._
import org.scalatest.WordSpec
import org.scalatest.wordspec.AnyWordSpec
import com.typesafe.config.ConfigFactory
import akka.util.ccompat.JavaConverters._
import akka.actor._
@ -23,7 +23,7 @@ object LoggingReceiveSpec {
}
}
class LoggingReceiveSpec extends WordSpec with BeforeAndAfterAll {
class LoggingReceiveSpec extends AnyWordSpec with BeforeAndAfterAll {
import LoggingReceiveSpec._
val config = ConfigFactory.parseString("""

5
akka-actor-tests/src/test/scala/akka/io/SimpleDnsCacheSpec.scala
View file

@ -11,12 +11,13 @@ import akka.io.dns.ARecord
import akka.io.dns.CachePolicy.Ttl
import akka.io.dns.DnsProtocol
import akka.io.dns.DnsProtocol.Ip
import org.scalatest.{ Matchers, WordSpec }
import scala.concurrent.duration._
import scala.collection.immutable
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class SimpleDnsCacheSpec extends WordSpec with Matchers {
class SimpleDnsCacheSpec extends AnyWordSpec with Matchers {
"Cache" should {
"not reply with expired but not yet swept out entries" in {
val localClock = new AtomicLong(0)

5
akka-actor-tests/src/test/scala/akka/io/dns/NameserverAddressParserSpec.scala
View file

@ -6,9 +6,10 @@ package akka.io.dns
import java.net.InetSocketAddress
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class NameserverAddressParserSpec extends WordSpec with Matchers {
class NameserverAddressParserSpec extends AnyWordSpec with Matchers {
"Parser" should {
"handle explicit port in IPv4 address" in {
DnsSettings.parseNameserverAddress("8.8.8.8:153") shouldEqual new InetSocketAddress("8.8.8.8", 153)

5
akka-actor-tests/src/test/scala/akka/io/dns/internal/MessageSpec.scala
View file

@ -6,9 +6,10 @@ package akka.io.dns.internal
import akka.io.dns.{ RecordClass, RecordType }
import akka.util.ByteString
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class MessageSpec extends WordSpec with Matchers {
class MessageSpec extends AnyWordSpec with Matchers {
"The Message" should {
"parse a response that is truncated mid-message" in {
val bytes = ByteString(0, 4, -125, -128, 0, 1, 0, 48, 0, 0, 0, 0, 4, 109, 97, 110, 121, 4, 98, 122, 122, 116, 3,

5
akka-actor-tests/src/test/scala/akka/io/dns/internal/ResolvConfParserSpec.scala
View file

@ -4,9 +4,10 @@
package akka.io.dns.internal
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class ResolvConfParserSpec extends WordSpec with Matchers {
class ResolvConfParserSpec extends AnyWordSpec with Matchers {
private def parse(str: String): ResolvConf = {
ResolvConfParser.parseLines(str.linesIterator)

2
akka-actor-tests/src/test/scala/akka/japi/JavaAPITest.scala
View file

@ -4,8 +4,8 @@
package akka.japi
import org.scalatest.junit.JUnitSuiteLike
import com.github.ghik.silencer.silent
import org.scalatestplus.junit.JUnitSuiteLike
@silent
class JavaAPITest extends JavaAPITestBase with JUnitSuiteLike

6
akka-actor-tests/src/test/scala/akka/util/AsciiStringCopySpec.scala
View file

@ -5,10 +5,10 @@
package akka.util
import java.nio.charset.StandardCharsets
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class AsciiStringCopySpec extends WordSpec with Matchers {
class AsciiStringCopySpec extends AnyWordSpec with Matchers {
"The copyUSAsciiStrToBytes optimization" must {

5
akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala
View file

@ -15,7 +15,8 @@ import org.scalatest.exceptions.TestFailedDueToTimeoutException
import org.scalatest.matchers.{ MatchResult, Matcher }
import org.scalatest.time.Span
import org.scalatest.time.SpanSugar._
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
import akka.util.ccompat.JavaConverters._
import scala.collection.mutable
@ -23,7 +24,7 @@ import scala.concurrent.{ Await, ExecutionContext, ExecutionContextExecutor, Fut
import scala.util.control.Exception
class BoundedBlockingQueueSpec
extends WordSpec
extends AnyWordSpec
with Matchers
with QueueSetupHelper
with CustomContainsMatcher

5
akka-actor-tests/src/test/scala/akka/util/ByteIteratorSpec.scala
View file

@ -5,9 +5,10 @@
package akka.util
import akka.util.ByteIterator.ByteArrayIterator
import org.scalatest._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class ByteIteratorSpec extends WordSpec with Matchers {
class ByteIteratorSpec extends AnyWordSpec with Matchers {
"A ByteIterator" should {
"correctly implement indexOf" in {

5
akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
View file

@ -15,12 +15,13 @@ import com.github.ghik.silencer.silent
import org.apache.commons.codec.binary.Hex.encodeHex
import org.scalacheck.Arbitrary.arbitrary
import org.scalacheck.{ Arbitrary, Gen }
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
import org.scalatestplus.scalacheck.Checkers
import scala.collection.mutable.Builder
class ByteStringSpec extends WordSpec with Matchers with Checkers {
class ByteStringSpec extends AnyWordSpec with Matchers with Checkers {
implicit val betterGeneratorDrivenConfig = PropertyCheckConfiguration().copy(minSuccessful = 1000)

6
akka-actor-tests/src/test/scala/akka/util/ImmutableIntMapSpec.scala
View file

@ -3,12 +3,12 @@
*/
package akka.util
import org.scalatest.Matchers
import org.scalatest.WordSpec
import scala.util.Random
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class ImmutableIntMapSpec extends WordSpec with Matchers {
class ImmutableIntMapSpec extends AnyWordSpec with Matchers {
"ImmutableIntMap" must {

2
akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala
View file

@ -5,12 +5,12 @@
package akka.util
import java.util.Comparator
import org.scalatest.Matchers
import scala.concurrent.Future
import akka.testkit.AkkaSpec
import scala.concurrent.Await
import scala.util.Random
import akka.testkit.DefaultTimeout
import org.scalatest.matchers.should.Matchers
class IndexSpec extends AkkaSpec with Matchers with DefaultTimeout {
implicit val ec = system.dispatcher

2
akka-actor-tests/src/test/scala/akka/util/JavaDurationSpec.scala
View file

@ -4,8 +4,8 @@
package akka.util
import org.scalatest.junit.JUnitSuiteLike
import com.github.ghik.silencer.silent
import org.scalatestplus.junit.JUnitSuiteLike
@silent
class JavaDurationSpec extends JavaDuration with JUnitSuiteLike

6
akka-actor-tests/src/test/scala/akka/util/ManifestInfoVersionSpec.scala
View file

@ -4,11 +4,11 @@
package akka.util
import org.scalatest.Matchers
import org.scalatest.WordSpec
import akka.util.ManifestInfo.Version
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class ManifestInfoVersionSpec extends WordSpec with Matchers {
class ManifestInfoVersionSpec extends AnyWordSpec with Matchers {
"Version" should {

6
akka-actor-tests/src/test/scala/akka/util/MessageBufferSpec.scala
View file

@ -5,10 +5,10 @@
package akka.util
import akka.actor.{ ActorPath, ActorRef, ActorRefProvider, MinimalActorRef }
import org.scalatest.WordSpec
import org.scalatest.Matchers
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class MessageBufferSpec extends WordSpec with Matchers {
class MessageBufferSpec extends AnyWordSpec with Matchers {
import MessageBufferSpec._

5
akka-actor-tests/src/test/scala/akka/util/PrettyDurationSpec.scala
View file

@ -4,9 +4,10 @@
package akka.util
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class PrettyDurationSpec extends WordSpec with Matchers {
class PrettyDurationSpec extends AnyWordSpec with Matchers {
import akka.util.PrettyDuration._

6
akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala
View file

@ -4,9 +4,9 @@
package akka.util
import org.scalatest.{ Matchers, WordSpec }
import scala.collection.immutable
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
object ReflectSpec {
final class A
@ -21,7 +21,7 @@ object ReflectSpec {
}
}
class ReflectSpec extends WordSpec with Matchers {
class ReflectSpec extends AnyWordSpec with Matchers {
import akka.util.ReflectSpec._

6
akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala
View file

@ -4,12 +4,12 @@
package akka.util
import org.scalatest.WordSpec
import org.scalatest.Matchers
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class SwitchSpec extends WordSpec with Matchers {
class SwitchSpec extends AnyWordSpec with Matchers {
"Switch" must {

6
akka-actor-tests/src/test/scala/akka/util/TypedMultiMapSpec.scala
View file

@ -4,9 +4,9 @@
package akka.util
import org.scalatest.WordSpec
import org.scalatest.Matchers
import org.scalactic.TypeCheckedTripleEquals
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
object TypedMultiMapSpec {
trait AbstractKey { type Type }
@ -16,7 +16,7 @@ object TypedMultiMapSpec {
type KV[K <: AbstractKey] = MyValue[K#Type]
}
class TypedMultiMapSpec extends WordSpec with Matchers with TypeCheckedTripleEquals {
class TypedMultiMapSpec extends AnyWordSpec with Matchers with TypeCheckedTripleEquals {
import TypedMultiMapSpec._
"A TypedMultiMap" must {

5
akka-actor-tests/src/test/scala/akka/util/WildcardIndexSpec.scala
View file

@ -4,9 +4,10 @@
package akka.util
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class WildcardIndexSpec extends WordSpec with Matchers {
class WildcardIndexSpec extends AnyWordSpec with Matchers {
"wildcard index" must {
"allow to insert elements using Arrays of strings" in {

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/ActorSystemTest.java
View file

@ -7,7 +7,7 @@ package akka.actor.typed;
import akka.Done;
import akka.actor.typed.javadsl.Behaviors;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.util.concurrent.CompletionStage;

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/ExtensionsTest.java
View file

@ -9,7 +9,7 @@ import akka.actor.typed.javadsl.Behaviors;
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;

3
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextAskTest.java
View file

@ -10,11 +10,10 @@ import akka.actor.typed.Behavior;
import akka.testkit.AkkaSpec;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import akka.actor.testkit.typed.javadsl.TestProbe;
import akka.util.Timeout;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.time.Duration;
import java.util.concurrent.TimeUnit;

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorContextPipeToSelfTest.java
View file

@ -13,7 +13,7 @@ import com.typesafe.config.ConfigFactory;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ActorLoggingTest.java
View file

@ -15,7 +15,7 @@ import com.typesafe.config.ConfigFactory;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import scala.concurrent.duration.FiniteDuration;
import java.util.HashMap;

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/AdapterTest.java
View file

@ -9,7 +9,7 @@ import akka.actor.typed.internal.adapter.SchedulerAdapter;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.time.Duration;

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/BehaviorBuilderTest.java
View file

@ -10,7 +10,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import akka.actor.typed.Behavior;
import akka.actor.typed.Terminated;

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/InterceptTest.java
View file

@ -12,7 +12,7 @@ import akka.testkit.AkkaSpec;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
public class InterceptTest extends JUnitSuite {

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/ReceiveBuilderTest.java
View file

@ -12,7 +12,7 @@ import akka.actor.typed.PostStop;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import akka.actor.typed.Behavior;

2
akka-actor-typed-tests/src/test/java/akka/actor/typed/javadsl/WatchTest.java
View file

@ -12,7 +12,7 @@ import akka.actor.testkit.typed.javadsl.LogCapturing;
import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
import org.junit.ClassRule;
import org.junit.Rule;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import org.junit.Test;
import akka.actor.typed.*;

2
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/AggregatorTest.java
View file

@ -16,7 +16,7 @@ import akka.actor.typed.javadsl.Receive;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.math.BigDecimal;
import java.time.Duration;

2
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/BubblingSampleTest.java
View file

@ -11,7 +11,7 @@ import akka.actor.typed.ActorRef;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.time.Duration;

1
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/DispatchersDocTest.java
View file

@ -6,7 +6,6 @@ package jdocs.akka.typed;
import akka.actor.typed.Behavior;
import akka.actor.typed.javadsl.*;
import org.scalatest.junit.JUnitSuite;
import akka.actor.typed.DispatcherSelector;
public class DispatchersDocTest {

2
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/InteractionPatternsTest.java
View file

@ -15,7 +15,7 @@ import akka.actor.testkit.typed.javadsl.TestProbe;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.net.URI;
import java.time.Duration;

2
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/MailboxDocTest.java
View file

@ -16,7 +16,7 @@ import com.typesafe.config.ConfigFactory;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
public class MailboxDocTest extends JUnitSuite {

2
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/StashDocTest.java
View file

@ -12,7 +12,7 @@ import akka.actor.typed.ActorRef;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;

2
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/ClassicWatchingTypedTest.java
View file

@ -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;

2
akka-actor-typed-tests/src/test/java/jdocs/akka/typed/coexistence/TypedWatchingClassicTest.java
View file

@ -18,7 +18,7 @@ import akka.actor.typed.javadsl.Behaviors;
import akka.actor.typed.javadsl.Receive;
import akka.testkit.javadsl.TestKit;
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
public class TypedWatchingClassicTest extends JUnitSuite {

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala
View file

@ -16,7 +16,7 @@ import akka.actor.testkit.typed.scaladsl.LoggingTestKit
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import akka.actor.testkit.typed.scaladsl.LogCapturing
import akka.actor.typed.eventstream.EventStream
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
object ActorSpecMessages {
@ -66,7 +66,7 @@ object ActorSpecMessages {
}
abstract class ActorContextSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
abstract class ActorContextSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
import ActorSpecMessages._

6
akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefResolverSpec.scala
View file

@ -10,11 +10,11 @@ import akka.actor.ActorSystemImpl
import akka.actor.MinimalActorRef
import akka.actor.RootActorPath
import akka.actor.typed.scaladsl.Behaviors
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class ActorRefResolverSpec extends WordSpec with ScalaFutures with Matchers {
class ActorRefResolverSpec extends AnyWordSpec with ScalaFutures with Matchers {
"ActorRefResolver" should {
"not allow serialization of ref originating from other system" in {
val system1 = ActorSystem(Behaviors.empty[String], "sys1")

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala
View file

@ -15,7 +15,6 @@ import scala.concurrent.{ ExecutionContext, TimeoutException }
import scala.util.Success
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import scala.concurrent.Future
import akka.actor.DeadLetter
@ -23,6 +22,7 @@ import akka.actor.UnhandledMessage
import akka.actor.testkit.typed.scaladsl.LoggingTestKit
import akka.actor.testkit.typed.scaladsl.LogCapturing
import akka.actor.typed.eventstream.EventStream
import org.scalatest.wordspec.AnyWordSpecLike
object AskSpec {
sealed trait Msg
@ -30,7 +30,7 @@ object AskSpec {
final case class Stop(replyTo: ActorRef[Unit]) extends Msg
}
class AskSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class AskSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
import AskSpec._

6
akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala
View file

@ -15,9 +15,9 @@ import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import akka.actor.testkit.typed.scaladsl.LogCapturing
import akka.actor.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox }
import org.scalactic.TypeCheckedTripleEquals
import org.scalatest.Matchers
import org.scalatest.WordSpecLike
import com.github.ghik.silencer.silent
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
object BehaviorSpec {
sealed trait Command {
@ -69,7 +69,7 @@ object BehaviorSpec {
override def next = StateA
}
trait Common extends WordSpecLike with Matchers with TypeCheckedTripleEquals with LogCapturing {
trait Common extends AnyWordSpecLike with Matchers with TypeCheckedTripleEquals with LogCapturing {
type Aux >: Null <: AnyRef
def behavior(monitor: ActorRef[Event]): (Behavior[Command], Aux)
@silent("never used")

7
akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala
View file

@ -11,7 +11,8 @@ import scala.util.control.NoStackTrace
import akka.actor.ActorInitializationException
import akka.actor.testkit.typed.scaladsl.LoggingTestKit
import org.scalatest.{ Matchers, WordSpec, WordSpecLike }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
object DeferredSpec {
sealed trait Command
@ -30,7 +31,7 @@ object DeferredSpec {
})
}
class DeferredSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class DeferredSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
import DeferredSpec._
implicit val testSettings = TestKitSettings(system)
@ -146,7 +147,7 @@ class DeferredSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogC
}
}
class DeferredStubbedSpec extends WordSpec with Matchers with LogCapturing {
class DeferredStubbedSpec extends AnyWordSpec with Matchers with LogCapturing {
import DeferredSpec._

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala
View file

@ -16,7 +16,7 @@ import akka.actor.testkit.typed.scaladsl.LogCapturing
import akka.actor.typed.receptionist.Receptionist
import akka.actor.typed.receptionist.ServiceKey
import akka.actor.typed.scaladsl.Behaviors
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
class DummyExtension1 extends Extension
object DummyExtension1 extends ExtensionId[DummyExtension1] {
@ -73,7 +73,7 @@ akka.actor.typed {
""").resolve()
}
class ExtensionsSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class ExtensionsSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
"The extensions subsystem" must {
"return the same instance for the same id" in

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala
View file

@ -8,7 +8,6 @@ import java.util.concurrent.atomic.AtomicBoolean
import akka.actor.testkit.typed.scaladsl.TestProbe
import akka.actor.typed.scaladsl.Behaviors
import org.scalatest.WordSpecLike
import scala.concurrent.duration._
import akka.actor.ActorInitializationException
@ -17,6 +16,7 @@ import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import akka.actor.testkit.typed.scaladsl.LogCapturing
import akka.actor.typed.internal.PoisonPill
import akka.actor.typed.internal.PoisonPillInterceptor
import org.scalatest.wordspec.AnyWordSpecLike
object InterceptSpec {
final case class Msg(hello: String, replyTo: ActorRef[String])
@ -75,7 +75,7 @@ object InterceptSpec {
}
}
class InterceptSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class InterceptSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
import BehaviorInterceptor._
import InterceptSpec._

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/LogMessagesSpec.scala
View file

@ -10,12 +10,12 @@ import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import akka.actor.testkit.typed.scaladsl.LogCapturing
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.scaladsl.adapter._
import org.scalatest.WordSpecLike
import org.slf4j.event.Level
import org.scalatest.wordspec.AnyWordSpecLike
class LogMessagesSpec extends ScalaTestWithActorTestKit("""
akka.loglevel = DEBUG # test verifies debug
""") with WordSpecLike with LogCapturing {
""") with AnyWordSpecLike with LogCapturing {
implicit val classic: actor.ActorSystem = system.toClassic

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala
View file

@ -18,14 +18,14 @@ import akka.dispatch.BoundedMessageQueueSemantics
import akka.dispatch.BoundedNodeMessageQueue
import akka.dispatch.MessageQueue
import akka.dispatch.UnboundedMessageQueueSemantics
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
class MailboxSelectorSpec extends ScalaTestWithActorTestKit("""
specific-mailbox {
mailbox-type = "akka.dispatch.NonBlockingBoundedMailbox"
mailbox-capacity = 4
}
""") with WordSpecLike with LogCapturing {
""") with AnyWordSpecLike with LogCapturing {
case class WhatsYourMailbox(replyTo: ActorRef[MessageQueue])
private def behavior: Behavior[WhatsYourMailbox] =

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/MonitorSpec.scala
View file

@ -8,9 +8,9 @@ import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import akka.actor.testkit.typed.scaladsl.TestProbe
import akka.actor.testkit.typed.scaladsl.LogCapturing
import akka.actor.typed.scaladsl.Behaviors
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
class MonitorSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class MonitorSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
"The monitor behavior" should {

6
akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala
View file

@ -8,8 +8,8 @@ import scala.annotation.tailrec
import akka.actor.testkit.typed.scaladsl._
import akka.actor.typed.scaladsl.Behaviors
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
/**
* Background: Originally there was an `OrElseBehavior` that could compose two `Behavior`, but that
@ -183,7 +183,7 @@ object OrElseSpec {
}
class OrElseSpec extends WordSpec with Matchers with LogCapturing {
class OrElseSpec extends AnyWordSpec with Matchers with LogCapturing {
import OrElseSpec._

6
akka-actor-typed-tests/src/test/scala/akka/actor/typed/PropsSpec.scala
View file

@ -5,10 +5,10 @@
package akka.actor.typed
import akka.actor.testkit.typed.scaladsl.LogCapturing
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class PropsSpec extends WordSpec with Matchers with LogCapturing {
class PropsSpec extends AnyWordSpec with Matchers with LogCapturing {
val dispatcherFirst = Props.empty.withDispatcherFromConfig("pool").withDispatcherDefault

7
akka-actor-typed-tests/src/test/scala/akka/actor/typed/SpawnProtocolSpec.scala
View file

@ -9,9 +9,10 @@ import akka.actor.testkit.typed.TestKitSettings
import akka.actor.testkit.typed.scaladsl._
import akka.actor.typed.scaladsl.Behaviors
import akka.util.Timeout
import org.scalatest.{ Matchers, WordSpec, WordSpecLike }
import scala.concurrent.Future
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
object SpawnProtocolSpec {
sealed trait Message
@ -26,7 +27,7 @@ object SpawnProtocolSpec {
}
}
class SpawnProtocolSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class SpawnProtocolSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
import SpawnProtocolSpec._
implicit val testSettings = TestKitSettings(system)
@ -96,7 +97,7 @@ class SpawnProtocolSpec extends ScalaTestWithActorTestKit with WordSpecLike with
}
}
class StubbedSpawnProtocolSpec extends WordSpec with Matchers with LogCapturing {
class StubbedSpawnProtocolSpec extends AnyWordSpec with Matchers with LogCapturing {
import SpawnProtocolSpec._

9
akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala
View file

@ -24,10 +24,9 @@ import akka.actor.typed.scaladsl.Behaviors._
import akka.actor.typed.scaladsl.AbstractBehavior
import akka.actor.typed.scaladsl.ActorContext
import akka.actor.typed.scaladsl.Behaviors
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.WordSpecLike
import org.slf4j.event.Level
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
object SupervisionSpec {
@ -94,7 +93,7 @@ object SupervisionSpec {
}
}
class StubbedSupervisionSpec extends WordSpec with Matchers with LogCapturing {
class StubbedSupervisionSpec extends AnyWordSpec with Matchers with LogCapturing {
import SupervisionSpec._
@ -255,7 +254,7 @@ class StubbedSupervisionSpec extends WordSpec with Matchers with LogCapturing {
class SupervisionSpec extends ScalaTestWithActorTestKit("""
akka.log-dead-letters = off
""") with WordSpecLike with LogCapturing {
""") with AnyWordSpecLike with LogCapturing {
import BehaviorInterceptor._
import SupervisionSpec._

5
akka-actor-typed-tests/src/test/scala/akka/actor/typed/TerminatedSpec.scala
View file

@ -6,9 +6,10 @@ package akka.actor.typed
import akka.actor.testkit.typed.scaladsl.TestInbox
import akka.actor.testkit.typed.scaladsl.LogCapturing
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class TerminatedSpec extends WordSpec with Matchers with LogCapturing {
class TerminatedSpec extends AnyWordSpec with Matchers with LogCapturing {
"Child Failed" must {
"should be pattern matchable" in {

4
akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala
View file

@ -19,9 +19,9 @@ import akka.actor.typed.eventstream.EventStream
import akka.actor.typed.scaladsl.Behaviors
import akka.actor.typed.scaladsl.TimerScheduler
import akka.testkit.TimingTest
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
class TimerSpec extends ScalaTestWithActorTestKit with WordSpecLike with LogCapturing {
class TimerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing {
sealed trait Command
case class Tick(n: Int) extends Command

Some files were not shown because too many files have changed in this diff Show more