=pro #3552 Upgrade ScalaTest to 1.9.2-SNAP2 for dbuild

* This can't go into 2.2.x since ScalaTest 1.9.2-SNAP2 has source incompatible changes and the dependecy in akka-multi-node-node-testkit would force people to upgrade.
This commit is contained in:
Björn Antonsson 2013-08-19 12:06:17 +02:00
parent 822f80bc69
commit 4a2b6effb3
27 changed files with 51 additions and 51 deletions

View file

@ -8,7 +8,7 @@ import akka.actor.ActorSystem
import akka.actor.Actor
import akka.actor.Props
import akka.testkit.TestKit
import org.scalatest.WordSpec
import org.scalatest.WordSpecLike
import org.scalatest.matchers.MustMatchers
import org.scalatest.BeforeAndAfterAll
import akka.testkit.ImplicitSender
@ -23,7 +23,7 @@ object MySpec {
//#implicit-sender
class MySpec(_system: ActorSystem) extends TestKit(_system) with ImplicitSender
with WordSpec with MustMatchers with BeforeAndAfterAll {
with WordSpecLike with MustMatchers with BeforeAndAfterAll {
//#implicit-sender
def this() = this(ActorSystem("MySpec"))

View file

@ -9,7 +9,7 @@ import language.postfixOps
import scala.util.Random
import org.scalatest.BeforeAndAfterAll
import org.scalatest.WordSpec
import org.scalatest.WordSpecLike
import org.scalatest.matchers.ShouldMatchers
import com.typesafe.config.ConfigFactory
@ -31,7 +31,7 @@ class TestKitUsageSpec
extends TestKit(ActorSystem("TestKitUsageSpec",
ConfigFactory.parseString(TestKitUsageSpec.config)))
with DefaultTimeout with ImplicitSender
with WordSpec with ShouldMatchers with BeforeAndAfterAll {
with WordSpecLike with ShouldMatchers with BeforeAndAfterAll {
import TestKitUsageSpec._
val echoRef = system.actorOf(Props[EchoActor])