diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-16 13:06:38 +1000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-07-15 22:32:43 -0700 |
| commit | a2973dfd954c0c094f956becb05a82bee5f7da01 (patch) | |
| tree | 2135ee1616ff3920d00c35046be2037af9aa3a3f /test/files/jvm | |
| parent | fa8012d28687986902ce1255a19f9f49affb3bca (diff) | |
| download | scala-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')
| -rw-r--r-- | test/files/jvm/future-spec.check | 2 | ||||
| -rw-r--r-- | test/files/jvm/future-spec/FutureTests.scala | 2 | ||||
| -rw-r--r-- | test/files/jvm/scala-concurrent-tck.check | 2 | ||||
| -rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/files/jvm/future-spec.check b/test/files/jvm/future-spec.check index 5c80aa5586..50c5d446af 100644 --- a/test/files/jvm/future-spec.check +++ b/test/files/jvm/future-spec.check @@ -1 +1 @@ -warning: there were 21 deprecation warnings; re-run with -deprecation for details +warning: there were 20 deprecation warnings; re-run with -deprecation for details 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 }) diff --git a/test/files/jvm/scala-concurrent-tck.check b/test/files/jvm/scala-concurrent-tck.check index bbe73c9982..9aef07d1e5 100644 --- a/test/files/jvm/scala-concurrent-tck.check +++ b/test/files/jvm/scala-concurrent-tck.check @@ -1 +1 @@ -warning: there were 74 deprecation warnings; re-run with -deprecation for details +warning: there were 73 deprecation warnings; re-run with -deprecation for details diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala index ba405e97bd..8069028cf5 100644 --- a/test/files/jvm/scala-concurrent-tck.scala +++ b/test/files/jvm/scala-concurrent-tck.scala @@ -629,7 +629,7 @@ trait BlockContexts extends TestBase { // test BlockContext in our default ExecutionContext def testDefaultFJP(): Unit = { val bc = getBlockContext(BlockContext.current) - assert(bc.isInstanceOf[scala.concurrent.forkjoin.ForkJoinWorkerThread]) + assert(bc.isInstanceOf[java.util.concurrent.ForkJoinWorkerThread]) } // test BlockContext inside BlockContext.withBlockContext |