summaryrefslogtreecommitdiff
path: root/test/files/jvm/future-spec/FutureTests.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-07-16 13:06:38 +1000
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-07-15 22:32:43 -0700
commita2973dfd954c0c094f956becb05a82bee5f7da01 (patch)
tree2135ee1616ff3920d00c35046be2037af9aa3a3f /test/files/jvm/future-spec/FutureTests.scala
parentfa8012d28687986902ce1255a19f9f49affb3bca (diff)
downloadscala-a2973dfd954c0c094f956becb05a82bee5f7da01.tar.gz
scala-a2973dfd954c0c094f956becb05a82bee5f7da01.tar.bz2
scala-a2973dfd954c0c094f956becb05a82bee5f7da01.zip
Remove further references to forkjoin
Use j.u.c.Forkjoin directly in active and disabled tests Remove bitrotted benchmarks code I was going to update these to use `java.util.concurrent.ForkJoin` directly, instead of our deprecated stubs. But most of them don't compile anymore (e.g. scala.testing.Benchmark has been removed, ClassTag imports missing). While I'm all for benchmarks, we should have large swathes of code checked in that isn't at compiled and run automatically. I'm happy to help someone resurrect these in a suitable form.
Diffstat (limited to 'test/files/jvm/future-spec/FutureTests.scala')
-rw-r--r--test/files/jvm/future-spec/FutureTests.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/future-spec/FutureTests.scala b/test/files/jvm/future-spec/FutureTests.scala
index 6b34d5bfaa..abcf1b4cbc 100644
--- a/test/files/jvm/future-spec/FutureTests.scala
+++ b/test/files/jvm/future-spec/FutureTests.scala
@@ -37,7 +37,7 @@ class FutureTests extends MinimalScalaTest {
"A future with custom ExecutionContext" should {
"shouldHandleThrowables" in {
val ms = new mutable.HashSet[Throwable] with mutable.SynchronizedSet[Throwable]
- implicit val ec = scala.concurrent.ExecutionContext.fromExecutor(new scala.concurrent.forkjoin.ForkJoinPool(), {
+ implicit val ec = scala.concurrent.ExecutionContext.fromExecutor(new java.util.concurrent.ForkJoinPool(), {
t =>
ms += t
})