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

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/DataEnvelopeSpec.scala
View file

@ -6,11 +6,11 @@ package akka.cluster.ddata
import akka.actor.Address
import akka.cluster.UniqueAddress
import org.scalatest.Matchers
import org.scalatest.WordSpec
import akka.cluster.ddata.Replicator.Internal.DataEnvelope
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class DataEnvelopeSpec extends WordSpec with Matchers {
class DataEnvelopeSpec extends AnyWordSpec with Matchers {
import PruningState._
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/DeltaPropagationSelectorSpec.scala
View file

@ -12,8 +12,8 @@ import akka.cluster.ddata.Replicator.Internal.Delta
import akka.cluster.ddata.Replicator.Internal.DeltaPropagation
import akka.cluster.ddata.Replicator.Internal.DeltaPropagation.NoDeltaPlaceholder
import org.scalactic.TypeCheckedTripleEquals
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
object DeltaPropagationSelectorSpec {
class TestSelector(val selfUniqueAddress: UniqueAddress, override val allNodes: Vector[UniqueAddress])
@ -31,7 +31,7 @@ object DeltaPropagationSelectorSpec {
val deltaC = GSet.empty[String] + "c"
}
class DeltaPropagationSelectorSpec extends WordSpec with Matchers with TypeCheckedTripleEquals {
class DeltaPropagationSelectorSpec extends AnyWordSpec with Matchers with TypeCheckedTripleEquals {
import DeltaPropagationSelectorSpec._
val selfUniqueAddress = UniqueAddress(Address("akka", "Sys", "localhost", 4999), 17L)
val nodes = (2500 until 2600).map(n => UniqueAddress(Address("akka", "Sys", "localhost", n), 17L)).toVector

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/FlagSpec.scala
View file

@ -5,10 +5,10 @@
package akka.cluster.ddata
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class FlagSpec extends WordSpec with Matchers {
class FlagSpec extends AnyWordSpec with Matchers {
"A Flag" must {

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/GCounterSpec.scala
View file

@ -7,10 +7,10 @@ package akka.cluster.ddata
import akka.actor.Address
import akka.cluster.UniqueAddress
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class GCounterSpec extends WordSpec with Matchers {
class GCounterSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(2552)), 2L)
val node3 = UniqueAddress(node1.address.copy(port = Some(2553)), 3L)

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/GSetSpec.scala
View file

@ -5,10 +5,10 @@
package akka.cluster.ddata
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class GSetSpec extends WordSpec with Matchers {
class GSetSpec extends AnyWordSpec with Matchers {
val user1 = """{"username":"john","password":"coltrane"}"""
val user2 = """{"username":"sonny","password":"rollins"}"""

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWMapSpec.scala
View file

@ -7,10 +7,10 @@ package akka.cluster.ddata
import akka.actor.Address
import akka.cluster.UniqueAddress
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class LWWMapSpec extends WordSpec with Matchers {
class LWWMapSpec extends AnyWordSpec with Matchers {
import LWWRegister.defaultClock
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWRegisterSpec.scala
View file

@ -7,10 +7,10 @@ package akka.cluster.ddata
import akka.actor.Address
import akka.cluster.UniqueAddress
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class LWWRegisterSpec extends WordSpec with Matchers {
class LWWRegisterSpec extends AnyWordSpec with Matchers {
import LWWRegister.defaultClock
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala
View file

@ -12,8 +12,8 @@ import akka.testkit.ImplicitSender
import akka.testkit.TestKit
import com.typesafe.config.ConfigFactory
import org.scalatest.BeforeAndAfterAll
import org.scalatest.Matchers
import org.scalatest.WordSpecLike
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
object LocalConcurrencySpec {
@ -39,7 +39,7 @@ object LocalConcurrencySpec {
class LocalConcurrencySpec(_system: ActorSystem)
extends TestKit(_system)
with WordSpecLike
with AnyWordSpecLike
with Matchers
with BeforeAndAfterAll
with ImplicitSender {

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMapSpec.scala
View file

@ -8,10 +8,10 @@ import akka.actor.Address
import akka.cluster.UniqueAddress
import akka.cluster.ddata.ORSet.AddDeltaOp
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class ORMapSpec extends WordSpec with Matchers {
class ORMapSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(2552)), 2L)

5
akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMultiMapSpec.scala
View file

@ -7,9 +7,10 @@ package akka.cluster.ddata
import akka.actor.Address
import akka.cluster.UniqueAddress
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.{ Matchers, WordSpec }
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class ORMultiMapSpec extends WordSpec with Matchers {
class ORMultiMapSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(2552)), 2L)

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/ORSetSpec.scala
View file

@ -9,10 +9,10 @@ import scala.collection.immutable.TreeMap
import akka.actor.Address
import akka.cluster.UniqueAddress
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class ORSetSpec extends WordSpec with Matchers {
class ORSetSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(2552)), 2L)

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterMapSpec.scala
View file

@ -7,10 +7,10 @@ package akka.cluster.ddata
import akka.actor.Address
import akka.cluster.UniqueAddress
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class PNCounterMapSpec extends WordSpec with Matchers {
class PNCounterMapSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(2552)), 2L)

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterSpec.scala
View file

@ -7,10 +7,10 @@ package akka.cluster.ddata
import akka.actor.Address
import akka.cluster.UniqueAddress
import akka.cluster.ddata.Replicator.Changed
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class PNCounterSpec extends WordSpec with Matchers {
class PNCounterSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(2552)), 2L)

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/PruningStateSpec.scala
View file

@ -6,10 +6,10 @@ package akka.cluster.ddata
import akka.actor.Address
import akka.cluster.UniqueAddress
import org.scalatest.Matchers
import org.scalatest.WordSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec
class PruningStateSpec extends WordSpec with Matchers {
class PruningStateSpec extends AnyWordSpec with Matchers {
import PruningState._
val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L)

8
akka-distributed-data/src/test/scala/akka/cluster/ddata/ReplicatorSettingsSpec.scala
View file

@ -6,7 +6,8 @@ package akka.cluster.ddata
import akka.testkit.AkkaSpec
import com.typesafe.config.ConfigFactory
import org.scalatest.{ BeforeAndAfterAll, WordSpecLike }
import org.scalatest.BeforeAndAfterAll
import org.scalatest.wordspec.AnyWordSpecLike
object ReplicatorSettingsSpec {
@ -17,7 +18,10 @@ object ReplicatorSettingsSpec {
akka.remote.artery.canonical.hostname = 127.0.0.1""")
}
class ReplicatorSettingsSpec extends AkkaSpec(ReplicatorSettingsSpec.config) with WordSpecLike with BeforeAndAfterAll {
class ReplicatorSettingsSpec
extends AkkaSpec(ReplicatorSettingsSpec.config)
with AnyWordSpecLike
with BeforeAndAfterAll {
"DistributedData" must {
"have the default replicator name" in {

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala
View file

@ -9,12 +9,12 @@ import akka.actor.Address
import akka.cluster.UniqueAddress
import akka.testkit.TestKit
import org.scalatest.BeforeAndAfterAll
import org.scalatest.Matchers
import org.scalatest.WordSpecLike
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
class VersionVectorSpec
extends TestKit(ActorSystem("VersionVectorSpec"))
with WordSpecLike
with AnyWordSpecLike
with Matchers
with BeforeAndAfterAll {

6
akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
View file

@ -9,8 +9,8 @@ import java.util.Base64
import akka.actor.ActorIdentity
import akka.actor.ActorRef
import org.scalatest.BeforeAndAfterAll
import org.scalatest.Matchers
import org.scalatest.WordSpecLike
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
import akka.actor.ActorSystem
import akka.actor.Address
import akka.actor.ExtendedActorSystem
@ -36,7 +36,7 @@ class ReplicatedDataSerializerSpec
akka.remote.classic.netty.tcp.port=0
akka.remote.artery.canonical.port = 0
""")))
with WordSpecLike
with AnyWordSpecLike
with Matchers
with BeforeAndAfterAll {

8
akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
View file

@ -4,12 +4,10 @@
package akka.cluster.ddata.protobuf
import java.lang.IllegalArgumentException
import scala.concurrent.duration._
import org.scalatest.BeforeAndAfterAll
import org.scalatest.Matchers
import org.scalatest.WordSpecLike
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
import akka.actor.ActorSystem
import akka.actor.Address
import akka.actor.ExtendedActorSystem
@ -40,7 +38,7 @@ class ReplicatorMessageSerializerSpec
akka.remote.classic.netty.tcp.port=0
akka.remote.artery.canonical.port = 0
""")))
with WordSpecLike
with AnyWordSpecLike
with Matchers
with BeforeAndAfterAll {