From 00d8fc4851646f6b5aac8506cd4c03a370b6430f Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 18 Dec 2012 11:16:41 +0100 Subject: [PATCH] #2812 - Fixing PatternSpec for gracefulStop by testing for juc.TimeoutException (common ancestor) --- .../src/test/scala/akka/pattern/PatternSpec.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala index f1ef0564f6..0adfa56c4c 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala @@ -8,6 +8,7 @@ import language.postfixOps import akka.testkit.AkkaSpec import akka.actor.{ Props, Actor } +import java.util.concurrent.TimeoutException import scala.concurrent.{ Future, Promise, Await } import scala.concurrent.duration._ @@ -39,10 +40,10 @@ class PatternSpec extends AkkaSpec { Await.ready(gracefulStop(target, 1 millis), 1 second) } - "complete Future with AskTimeoutException when actor not terminated within timeout" in { + "complete Future with TimeoutException when actor not terminated within timeout" in { val target = system.actorOf(Props[TargetActor]) target ! Work(250 millis) - intercept[AskTimeoutException] { Await.result(gracefulStop(target, 10 millis), 200 millis) } + intercept[TimeoutException] { Await.result(gracefulStop(target, 10 millis), 200 millis) } } }