From 0057d4d83cb40116b76296505f15075002e4b2e0 Mon Sep 17 00:00:00 2001
From: James Iry <james.iry@typesafe.com>
Date: Mon, 22 Jul 2013 16:23:31 -0700
Subject: Make future-spec tests not spawn threads in constructors. The
 future-spec tests were spawning threads in object constructors which meant
 they were on the ragged edge of entering deadlock from the static
 initialization lock acquired during the static initialization blocks we use
 to construct object reference fields. My work on restructuring lambdas pushed
 it over the edge. This commit refactors the tests to use class constructors
 rather than object constructors.

---
 test/files/jvm/future-spec/FutureTests.scala  | 2 +-
 test/files/jvm/future-spec/PromiseTests.scala | 2 +-
 test/files/jvm/future-spec/TryTests.scala     | 2 +-
 test/files/jvm/future-spec/main.scala         | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/files/jvm/future-spec/FutureTests.scala b/test/files/jvm/future-spec/FutureTests.scala
index 5d213691df..1595b2c862 100644
--- a/test/files/jvm/future-spec/FutureTests.scala
+++ b/test/files/jvm/future-spec/FutureTests.scala
@@ -10,7 +10,7 @@ import scala.util.{Try,Success,Failure}
 
 
 
-object FutureTests extends MinimalScalaTest {
+class FutureTests extends MinimalScalaTest {
 
   /* some utils */
 
diff --git a/test/files/jvm/future-spec/PromiseTests.scala b/test/files/jvm/future-spec/PromiseTests.scala
index 6e613bf3ec..49350586b8 100644
--- a/test/files/jvm/future-spec/PromiseTests.scala
+++ b/test/files/jvm/future-spec/PromiseTests.scala
@@ -9,7 +9,7 @@ import scala.runtime.NonLocalReturnControl
 import scala.util.{Try,Success,Failure}
 
 
-object PromiseTests extends MinimalScalaTest {
+class PromiseTests extends MinimalScalaTest {
   import ExecutionContext.Implicits._
 
   val defaultTimeout = Inf
diff --git a/test/files/jvm/future-spec/TryTests.scala b/test/files/jvm/future-spec/TryTests.scala
index 5d1b9b84b4..01bb3c9d36 100644
--- a/test/files/jvm/future-spec/TryTests.scala
+++ b/test/files/jvm/future-spec/TryTests.scala
@@ -5,7 +5,7 @@
 
 import scala.util.{Try,Success,Failure}
 
-object TryTests extends MinimalScalaTest {
+class TryTests extends MinimalScalaTest {
   class MyException extends Exception
   val e = new Exception("this is an exception")
 
diff --git a/test/files/jvm/future-spec/main.scala b/test/files/jvm/future-spec/main.scala
index 132263e2e8..697d0fe91f 100644
--- a/test/files/jvm/future-spec/main.scala
+++ b/test/files/jvm/future-spec/main.scala
@@ -10,9 +10,9 @@ import java.util.concurrent.{ TimeoutException, CountDownLatch, TimeUnit }
 object Test {
 
   def main(args: Array[String]) {
-    FutureTests.check()
-    PromiseTests.check()
-    TryTests.check()
+    (new FutureTests).check()
+    (new PromiseTests).check()
+    (new TryTests).check()
   }
 
 }
-- 
cgit v1.2.3