=pro #3759 Changed to using non-deprecated ScalaTest Matchers

This commit is contained in:
Björn Antonsson 2013-12-17 14:25:56 +01:00
parent b8c7d7badd
commit 003609c9c5
246 changed files with 2822 additions and 2822 deletions

View file

@ -125,7 +125,7 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMedia
def awaitCount(expected: Int): Unit = {
awaitAssert {
mediator ! Count
expectMsgType[Int] must be(expected)
expectMsgType[Int] should be(expected)
}
}
@ -150,7 +150,7 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMedia
// send to actor at same node
u1 ! Whisper("/user/u2", "hello")
expectMsg("hello")
lastSender must be(u2)
lastSender should be(u2)
}
runOn(second) {
@ -180,7 +180,7 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMedia
runOn(second) {
expectMsg("hi there")
lastSender.path.name must be("u4")
lastSender.path.name should be("u4")
}
enterBarrier("after-2")
@ -203,7 +203,7 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMedia
runOn(second) {
expectMsg("go")
lastSender.path.name must be("u4")
lastSender.path.name should be("u4")
}
enterBarrier("after-3")
@ -248,7 +248,7 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMedia
runOn(first, second) {
expectMsg("hi")
lastSender.path.name must be("u7")
lastSender.path.name should be("u7")
}
runOn(third) {
expectNoMsg(2.seconds)
@ -283,11 +283,11 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMedia
val names = receiveWhile(messages = 2) {
case "hello all" lastSender.path.name
}
names.toSet must be(Set("u8", "u9"))
names.toSet should be(Set("u8", "u9"))
}
runOn(second) {
expectMsg("hello all")
lastSender.path.name must be("u10")
lastSender.path.name should be("u10")
}
runOn(third) {
expectNoMsg(2.seconds)
@ -337,7 +337,7 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMedia
runOn(first, second) {
expectMsg("hi")
lastSender.path.name must be("u11")
lastSender.path.name should be("u11")
}
runOn(third) {
expectNoMsg(2.seconds) // sender node should not receive a message
@ -354,10 +354,10 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMedia
runOn(first) {
mediator ! Status(versions = Map.empty)
val deltaBuckets = expectMsgType[Delta].buckets
deltaBuckets.size must be(3)
deltaBuckets.find(_.owner == firstAddress).get.content.size must be(7)
deltaBuckets.find(_.owner == secondAddress).get.content.size must be(6)
deltaBuckets.find(_.owner == thirdAddress).get.content.size must be(2)
deltaBuckets.size should be(3)
deltaBuckets.find(_.owner == firstAddress).get.content.size should be(7)
deltaBuckets.find(_.owner == secondAddress).get.content.size should be(6)
deltaBuckets.find(_.owner == thirdAddress).get.content.size should be(2)
}
enterBarrier("verified-initial-delta")
@ -369,16 +369,16 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMedia
mediator ! Status(versions = Map.empty)
val deltaBuckets1 = expectMsgType[Delta].buckets
deltaBuckets1.map(_.content.size).sum must be(500)
deltaBuckets1.map(_.content.size).sum should be(500)
mediator ! Status(versions = deltaBuckets1.map(b b.owner -> b.version).toMap)
val deltaBuckets2 = expectMsgType[Delta].buckets
deltaBuckets1.map(_.content.size).sum must be(500)
deltaBuckets1.map(_.content.size).sum should be(500)
mediator ! Status(versions = deltaBuckets2.map(b b.owner -> b.version).toMap)
val deltaBuckets3 = expectMsgType[Delta].buckets
deltaBuckets3.map(_.content.size).sum must be(7 + 6 + 2 + many - 500 - 500)
deltaBuckets3.map(_.content.size).sum should be(7 + 6 + 2 + many - 500 - 500)
}
enterBarrier("verified-delta-with-many")