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

Update after merge

Browse source
This commit is contained in:
Mikhail Limansky 2020-01-17 16:33:13 +03:00
parent 52c01832da
commit feb9499431
26 changed files with 59 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ package akka.actor;
*/
import org.junit.Test;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
import java.util.Optional;

8
akka-docs/src/main/paradox/multi-jvm-testing.md
View file

@ -178,10 +178,10 @@ classpath. Here is a similar example to the one above but using ScalaTest:
```scala
package sample
import org.scalatest.WordSpec
import org.scalatest.matchers.MustMatchers
import org.scalatest.wordspec.AnyWordSpec
import org.scalatest.matchers.must.Matchers
class SpecMultiJvmNode1 extends WordSpec with MustMatchers {
class SpecMultiJvmNode1 extends AnyWordSpec with Matchers {
"A node" should {
"be able to say hello" in {
val message = "Hello from node 1"
@ -190,7 +190,7 @@ class SpecMultiJvmNode1 extends WordSpec with MustMatchers {
}
}
class SpecMultiJvmNode2 extends WordSpec with MustMatchers {
class SpecMultiJvmNode2 extends AnyWordSpec with Matchers {
"A node" should {
"be able to say hello" in {
val message = "Hello from node 2"

1
akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala
View file

@ -18,7 +18,6 @@ import akka.event.Logging
import scala.concurrent.Future
import akka.actor.{ ActorLogging, ActorRef, ActorSystem, PoisonPill, Terminated }
import org.scalatest.{ BeforeAndAfterAll, WordSpec }
import akka.testkit._
import akka.util._
import scala.concurrent.duration._

9
akka-docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala
View file

@ -7,12 +7,13 @@ package docs.actor
import language.postfixOps
import akka.actor.{ ActorRef, ActorSystem, Props, Terminated }
import FaultHandlingDocSpec._
import org.scalatest.{ WordSpec, WordSpecLike }
//#testkit
import com.typesafe.config.{ Config, ConfigFactory }
import org.scalatest.{ BeforeAndAfterAll, Matchers }
import akka.testkit.{ EventFilter, ImplicitSender, TestActors, TestKit }
import org.scalatest.BeforeAndAfterAll
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
import akka.testkit.{ EventFilter, ImplicitSender, TestKit }
//#testkit
object FaultHandlingDocSpec {
@ -104,7 +105,7 @@ object FaultHandlingDocSpec {
class FaultHandlingDocSpec(_system: ActorSystem)
extends TestKit(_system)
with ImplicitSender
with WordSpecLike
with AnyWordSpecLike
with Matchers
with BeforeAndAfterAll {

4
akka-docs/src/test/scala/docs/actor/PropsEdgeCaseSpec.scala
View file

@ -6,14 +6,14 @@ package docs.actor
import akka.actor.{ Actor, Props }
import docs.CompileOnlySpec
import org.scalatest.WordSpec
import org.scalatest.wordspec.AnyWordSpec
//#props-edge-cases-value-class
case class MyValueClass(v: Int) extends AnyVal
//#props-edge-cases-value-class
class PropsEdgeCaseSpec extends WordSpec with CompileOnlySpec {
class PropsEdgeCaseSpec extends AnyWordSpec with CompileOnlySpec {
"value-class-edge-case-example" in compileOnlySpec {
//#props-edge-cases-value-class-example
class ValueActor(value: MyValueClass) extends Actor {

2
akka-docs/src/test/scala/docs/actor/SchedulerDocSpec.scala
View file

@ -13,8 +13,6 @@ import scala.concurrent.duration._
//#imports1
import org.scalatest.{ BeforeAndAfterAll, WordSpec }
import org.scalatest.Matchers
import akka.testkit._
class SchedulerDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {

6
akka-docs/src/test/scala/docs/config/ConfigDocSpec.scala
View file

@ -6,15 +6,15 @@ package docs.config
import akka.actor.testkit.typed.scaladsl.ActorTestKit
import akka.actor.typed.scaladsl.Behaviors
import org.scalatest.WordSpec
import org.scalatest.Matchers
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
//#imports
import akka.actor.typed.ActorSystem
import com.typesafe.config.ConfigFactory
//#imports
class ConfigDocSpec extends WordSpec with Matchers {
class ConfigDocSpec extends AnyWordSpec with Matchers {
val rootBehavior = Behaviors.empty[String]
def compileOnlyCustomConfig(): Unit = {

7
akka-docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala
View file

@ -7,7 +7,6 @@ package docs.io
import java.net.Inet6Address
import java.net.NetworkInterface
import akka.Done
import akka.actor.ActorSystem
import akka.actor.Props
import akka.io.Udp
@ -15,14 +14,14 @@ import akka.testkit.SocketUtil
import akka.testkit.TestKit
import akka.util.ccompat.JavaConverters._
import org.scalatest.BeforeAndAfterAll
import org.scalatest.Matchers
import org.scalatest.WordSpecLike
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
import scala.util.Random
class ScalaUdpMulticastSpec
extends TestKit(ActorSystem("ScalaUdpMulticastSpec"))
with WordSpecLike
with AnyWordSpecLike
with Matchers
with BeforeAndAfterAll {

7
akka-docs/src/test/scala/docs/persistence/PersistencePluginDocSpec.scala
View file

@ -8,12 +8,11 @@ import scala.collection.immutable
import akka.actor.ActorSystem
import akka.testkit.TestKit
import com.typesafe.config._
import org.scalatest.WordSpec
import scala.collection.immutable.Seq
import org.scalatest.wordspec.AnyWordSpec
import scala.concurrent.Future
import scala.util.Try
import scala.concurrent.duration._
import scala.util.control.NonFatal
//#plugin-imports
import akka.persistence._
@ -62,7 +61,7 @@ object PersistencePluginDocSpec {
"""
}
class PersistencePluginDocSpec extends WordSpec {
class PersistencePluginDocSpec extends AnyWordSpec {
new AnyRef {
val providerConfig =
"""

4
akka-docs/src/test/scala/docs/persistence/PersistenceSchemaEvolutionDocSpec.scala
View file

@ -14,13 +14,13 @@ import akka.persistence.journal.{ EventAdapter, EventSeq }
import akka.serialization.{ SerializationExtension, SerializerWithStringManifest }
import akka.testkit.TestKit
import com.typesafe.config._
import org.scalatest.WordSpec
import org.scalatest.wordspec.AnyWordSpec
import spray.json.JsObject
import scala.concurrent.duration._
import docs.persistence.proto.FlightAppModels
class PersistenceSchemaEvolutionDocSpec extends WordSpec {
class PersistenceSchemaEvolutionDocSpec extends AnyWordSpec {
val customSerializerConfig =
"""

5
akka-docs/src/test/scala/docs/persistence/PersistenceSerializerDocSpec.scala
View file

@ -5,13 +5,14 @@
package docs.persistence
import com.typesafe.config._
import scala.concurrent.duration._
import org.scalatest.WordSpec
import org.scalatest.wordspec.AnyWordSpec
import akka.actor.ActorSystem
import akka.serialization.{ SerializationExtension, Serializer }
import akka.testkit.TestKit
class PersistenceSerializerDocSpec extends WordSpec {
class PersistenceSerializerDocSpec extends AnyWordSpec {
val customSerializerConfig =
"""

5
akka-docs/src/test/scala/docs/stream/QuickStartDocSpec.scala
View file

@ -18,7 +18,8 @@ import scala.concurrent.duration._
import java.nio.file.Paths
//#other-imports
import org.scalatest._
import org.scalatest.BeforeAndAfterAll
import org.scalatest.wordspec.AnyWordSpec
import org.scalatest.concurrent._
//#main-app
@ -28,7 +29,7 @@ object Main extends App {
}
//#main-app
class QuickStartDocSpec extends WordSpec with BeforeAndAfterAll with ScalaFutures {
class QuickStartDocSpec extends AnyWordSpec with BeforeAndAfterAll with ScalaFutures {
implicit val patience = PatienceConfig(5.seconds)
def println(any: Any) = () // silence printing stuff

7
akka-docs/src/test/scala/docs/testkit/ParentChildSpec.scala
View file

@ -4,14 +4,13 @@
package docs.testkit
import org.scalatest.WordSpec
import org.scalatest.Matchers
import org.scalatest.wordspec.AnyWordSpec
import org.scalatest.matchers.should.Matchers
import akka.testkit.TestKitBase
import akka.actor.ActorSystem
import akka.actor.Props
import akka.actor.Actor
import akka.actor.ActorRef
import akka.testkit.ImplicitSender
import akka.testkit.TestProbe
import akka.actor.ActorRefFactory
import akka.testkit.TestKit
@ -76,7 +75,7 @@ class MockedChild extends Actor {
}
}
class ParentChildSpec extends WordSpec with Matchers with TestKitBase with BeforeAndAfterAll {
class ParentChildSpec extends AnyWordSpec with Matchers with TestKitBase with BeforeAndAfterAll {
implicit lazy val system = ActorSystem("ParentChildSpec")
override def afterAll(): Unit = {

6
akka-docs/src/test/scala/docs/testkit/PlainWordSpec.scala
View file

@ -7,13 +7,15 @@ package docs.testkit
//#plain-spec
import akka.actor.ActorSystem
import akka.testkit.{ ImplicitSender, TestActors, TestKit }
import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike }
import org.scalatest.BeforeAndAfterAll
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
//#implicit-sender
class MySpec()
extends TestKit(ActorSystem("MySpec"))
with ImplicitSender
with WordSpecLike
with AnyWordSpecLike
with Matchers
with BeforeAndAfterAll {
//#implicit-sender

6
akka-docs/src/test/scala/docs/testkit/TestKitUsageSpec.scala
View file

@ -10,8 +10,8 @@ import language.postfixOps
import scala.util.Random
import org.scalatest.BeforeAndAfterAll
import org.scalatest.WordSpecLike
import org.scalatest.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
import org.scalatest.matchers.should.Matchers
import com.typesafe.config.ConfigFactory
@ -30,7 +30,7 @@ class TestKitUsageSpec
extends TestKit(ActorSystem("TestKitUsageSpec", ConfigFactory.parseString(TestKitUsageSpec.config)))
with DefaultTimeout
with ImplicitSender
with WordSpecLike
with AnyWordSpecLike
with Matchers
with BeforeAndAfterAll {
import TestKitUsageSpec._

4
akka-docs/src/test/scala/typed/tutorial_1/ActorHierarchyExperiments.scala
View file

@ -5,7 +5,7 @@
package typed.tutorial_1
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
import akka.actor.typed.PostStop
import akka.actor.typed.PreRestart
import akka.actor.typed.Signal
@ -151,7 +151,7 @@ object ActorHierarchyExperiments extends App {
}
//#print-refs
class ActorHierarchyExperiments extends ScalaTestWithActorTestKit with WordSpecLike {
class ActorHierarchyExperiments extends ScalaTestWithActorTestKit with AnyWordSpecLike {
"ActorHierarchyExperiments" must {

4
akka-docs/src/test/scala/typed/tutorial_3/DeviceSpec.scala
View file

@ -6,9 +6,9 @@ package typed.tutorial_3
//#device-read-test
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
class DeviceSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
import Device._
"Device actor" must {

5
akka-docs/src/test/scala/typed/tutorial_4/DeviceGroupSpec.scala
View file

@ -5,13 +5,12 @@
package typed.tutorial_4
import scala.concurrent.duration._
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
import typed.tutorial_4.Device._
import typed.tutorial_4.DeviceManager._
class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
class DeviceGroupSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
"DeviceGroup actor" must {

4
akka-docs/src/test/scala/typed/tutorial_4/DeviceManagerSpec.scala
View file

@ -5,10 +5,10 @@
package typed.tutorial_4
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
import typed.tutorial_4.DeviceManager._
class DeviceManagerSpec extends ScalaTestWithActorTestKit with WordSpecLike {
class DeviceManagerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
"DeviceManager actor" must {

4
akka-docs/src/test/scala/typed/tutorial_4/DeviceSpec.scala
View file

@ -5,9 +5,9 @@
package typed.tutorial_4
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
class DeviceSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
import Device._
"Device actor" must {

5
akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupQuerySpec.scala
View file

@ -5,9 +5,8 @@
package typed.tutorial_5
import scala.concurrent.duration._
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
import typed.tutorial_5.Device.Command
import typed.tutorial_5.DeviceGroupQuery.WrappedRespondTemperature
import typed.tutorial_5.DeviceManager.DeviceNotAvailable
@ -16,7 +15,7 @@ import typed.tutorial_5.DeviceManager.RespondAllTemperatures
import typed.tutorial_5.DeviceManager.Temperature
import typed.tutorial_5.DeviceManager.TemperatureNotAvailable
class DeviceGroupQuerySpec extends ScalaTestWithActorTestKit with WordSpecLike {
class DeviceGroupQuerySpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
"DeviceGroupQuery" must {

5
akka-docs/src/test/scala/typed/tutorial_5/DeviceGroupSpec.scala
View file

@ -5,13 +5,12 @@
package typed.tutorial_5
import scala.concurrent.duration._
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
import typed.tutorial_5.Device._
import typed.tutorial_5.DeviceManager._
class DeviceGroupSpec extends ScalaTestWithActorTestKit with WordSpecLike {
class DeviceGroupSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
"DeviceGroup actor" must {

4
akka-docs/src/test/scala/typed/tutorial_5/DeviceManagerSpec.scala
View file

@ -5,10 +5,10 @@
package typed.tutorial_5
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
import typed.tutorial_5.DeviceManager._
class DeviceManagerSpec extends ScalaTestWithActorTestKit with WordSpecLike {
class DeviceManagerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
"DeviceManager actor" must {

4
akka-docs/src/test/scala/typed/tutorial_5/DeviceSpec.scala
View file

@ -5,9 +5,9 @@
package typed.tutorial_5
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import org.scalatest.WordSpecLike
import org.scalatest.wordspec.AnyWordSpecLike
class DeviceSpec extends ScalaTestWithActorTestKit with WordSpecLike {
class DeviceSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike {
import Device._
"Device actor" must {

2
akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
View file

@ -523,7 +523,7 @@ abstract class MultiNodeSpec(
* Example trait for MultiNodeSpec with ScalaTest
*
* {{{
* trait STMultiNodeSpec extends MultiNodeSpecCallbacks with WordSpecLike with MustMatchers with BeforeAndAfterAll {
* trait STMultiNodeSpec extends MultiNodeSpecCallbacks with AnyWordSpecLike with Matchers with BeforeAndAfterAll {
* override def beforeAll() = multiNodeSpecBeforeAll()
* override def afterAll() = multiNodeSpecAfterAll()
* }

2
akka-stream-tests/src/test/java-jdk9-only/akka/stream/javadsl/JavaFlowSupportCompileTest.java
View file

@ -10,7 +10,7 @@ import org.junit.Test;
import java.util.concurrent.Flow;
import org.scalatest.junit.JUnitSuite;
import org.scalatestplus.junit.JUnitSuite;
public class JavaFlowSupportCompileTest extends JUnitSuite {
@Test