From f41f706ce5f8bcb02bd989c19577cd7c438688a9 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Mon, 20 Aug 2012 21:42:50 +0200
Subject: [PATCH] adapt to different error messages, fix one case of Props()

---
 .../src/test/scala/akka/actor/LocalActorRefProviderSpec.scala | 4 ++--
 .../src/test/scala/akka/dispatch/FutureSpec.scala             | 4 ++--
 .../akka/serialization/DaemonMsgCreateSerializerSpec.scala    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
index f263a2f188..084d2ddf8b 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
@@ -5,13 +5,13 @@
 package akka.actor
 
 import language.postfixOps
-
 import akka.testkit._
 import scala.concurrent.Await
 import scala.concurrent.util.duration._
 import akka.util.Timeout
 import scala.concurrent.Future
 import scala.util.Success
+import scala.util.Failure
 
 object LocalActorRefProviderSpec {
   val config = """
@@ -55,7 +55,7 @@ class LocalActorRefProviderSpec extends AkkaSpec(LocalActorRefProviderSpec.confi
         val actors = for (j ← 1 to 4) yield Future(system.actorOf(Props(c ⇒ { case _ ⇒ }), address))
         val set = Set() ++ actors.map(a ⇒ Await.ready(a, timeout.duration).value match {
           case Some(Success(a: ActorRef)) ⇒ 1
-          case Some(Success(ex: InvalidActorNameException)) ⇒ 2
+          case Some(Failure(ex: InvalidActorNameException)) ⇒ 2
           case x ⇒ x
         })
         set must be === Set(1, 2)
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
index a151330b80..82cea61625 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
@@ -897,7 +897,7 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
     "filter result" in {
       f { (future, result) ⇒
         Await.result((future filter (_ ⇒ true)), timeout.duration) must be(result)
-        (evaluating { Await.result((future filter (_ ⇒ false)), timeout.duration) } must produce[java.util.NoSuchElementException]).getMessage must endWith(result.toString)
+        evaluating { Await.result((future filter (_ ⇒ false)), timeout.duration) } must produce[java.util.NoSuchElementException]
       }
     }
     "transform result with map" in { f((future, result) ⇒ Await.result((future map (_.toString.length)), timeout.duration) must be(result.toString.length)) }
@@ -938,7 +938,7 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
     "contain a value" in {
       f((future, message) ⇒ {
         future.value must be('defined)
-        future.value.get must be('left)
+        future.value.get must be('failure)
         future.value.get match {
           case Failure(f) ⇒ f.getMessage must be(message)
         }
diff --git a/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala b/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala
index 89532bea91..0c92ec7ee1 100644
--- a/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala
+++ b/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala
@@ -47,7 +47,7 @@ class DaemonMsgCreateSerializerSpec extends AkkaSpec {
     "serialize and de-serialize DaemonMsgCreate with function creator" in {
       verifySerialization {
         DaemonMsgCreate(
-          props = Props().withCreator(new MyActor),
+          props = Props.empty.withCreator(new MyActor),
           deploy = Deploy(),
           path = "foo",
           supervisor = supervisor)