From bc791369f79f2d1a72a93674eb7b0f34ca58d8d1 Mon Sep 17 00:00:00 2001
From: Philipp Haller <hallerp@gmail.com>
Date: Tue, 13 Apr 2010 14:41:02 +0000
Subject: Hardened actor tests. No review.

---
 test/files/jvm/actor-link-getstate.scala | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'test/files/jvm/actor-link-getstate.scala')

diff --git a/test/files/jvm/actor-link-getstate.scala b/test/files/jvm/actor-link-getstate.scala
index ec01757883..c4c33ef752 100644
--- a/test/files/jvm/actor-link-getstate.scala
+++ b/test/files/jvm/actor-link-getstate.scala
@@ -7,6 +7,7 @@ case class MyException(text: String) extends Exception(text) {
 
 object Slave extends Actor {
   def act() {
+    try {
     loop {
       react {
         case 'doWork =>
@@ -14,18 +15,27 @@ object Slave extends Actor {
           reply('done)
       }
     }
+    } catch {
+      case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+        e.printStackTrace()
+    }
   }
 }
 
 object Master extends Actor {
   override def toString = "Master"
   def act() {
+    try {
     link(Slave)
     Slave ! 'doWork
     react {
       case 'done =>
         throw new MyException("Master crashed")
     }
+    } catch {
+      case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+        e.printStackTrace()
+    }
   }
 }
 
@@ -33,6 +43,7 @@ object Test {
 
   def main(args: Array[String]) {
     actor {
+      try {
       self.trapExit = true
       link(Slave)
       Slave.start()
@@ -41,6 +52,10 @@ object Test {
         case Exit(from, reason) if (from == Slave) =>
           Console.err.println(Slave.getState)
       }
+      } catch {
+        case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+          e.printStackTrace()
+      }
     }
   }
 
-- 
cgit v1.2.3