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

Merge pull request #1650 from akka/wip-3552-upgrade-scalatest-for-dbuild-ban

Browse source 
=pro #3552 Upgrade ScalaTest to 1.9.2-SNAP2 for dbuild
This commit is contained in:
Björn Antonsson 2013-08-20 03:51:13 -07:00
commit ffea36a8c8
26 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-docs/rst/scala/code/docs/testkit/PlainWordSpec.scala
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"))

4
akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala
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])