diff options
Diffstat (limited to 'src/test/scala/scala')
5 files changed, 8 insertions, 8 deletions
diff --git a/src/test/scala/scala/async/TreeInterrogation.scala b/src/test/scala/scala/async/TreeInterrogation.scala index 1637102..d2e8513 100644 --- a/src/test/scala/scala/async/TreeInterrogation.scala +++ b/src/test/scala/scala/async/TreeInterrogation.scala @@ -13,7 +13,7 @@ class TreeInterrogation { @Test def `a minimal set of vals are lifted to vars`() { val cm = reflect.runtime.currentMirror - val tb = mkToolbox(s"-cp ${toolboxClasspath}") + val tb = mkToolbox(s"-cp $toolboxClasspath") val tree = tb.parse( """| import _root_.scala.async.internal.AsyncId._ | async { @@ -49,7 +49,7 @@ class TreeInterrogation { && !dd.symbol.asTerm.isAccessor && !dd.symbol.asTerm.isSetter => dd.name } }.flatten - defDefs.map(_.decoded.trim).toList mustStartWith (List("foo$macro$", "<init>", "apply", "apply")) + defDefs.map(_.decoded.trim) mustStartWith List("foo$macro$", "<init>", "apply", "apply") } } diff --git a/src/test/scala/scala/async/run/SyncOptimizationSpec.scala b/src/test/scala/scala/async/run/SyncOptimizationSpec.scala index dd649f4..0d08279 100644 --- a/src/test/scala/scala/async/run/SyncOptimizationSpec.scala +++ b/src/test/scala/scala/async/run/SyncOptimizationSpec.scala @@ -10,7 +10,7 @@ class SyncOptimizationSpec { @Test def awaitOnCompletedFutureRunsOnSameThread: Unit = { - def stackDepth = Thread.currentThread().getStackTrace.size + def stackDepth = Thread.currentThread().getStackTrace.length val future = async { val thread1 = Thread.currentThread diff --git a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala index 13cc351..29b7c1d 100644 --- a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala +++ b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala @@ -217,7 +217,7 @@ class AnfTransformSpec { val result = async { var i = 0 def next() = { - i += 1; + i += 1 i } foo(next(), await(next())) @@ -298,7 +298,7 @@ class AnfTransformSpec { val result = async { var i = 0 def next() = { - i += 1; + i += 1 i } foo(b = next(), a = await(next())) @@ -311,7 +311,7 @@ class AnfTransformSpec { import AsyncId.{async, await} var i = 0 def next() = { - i += 1; + i += 1 i } def foo(a: Int = next(), b: Int = next()) = (a, b) diff --git a/src/test/scala/scala/async/run/ifelse4/IfElse4.scala b/src/test/scala/scala/async/run/ifelse4/IfElse4.scala index b0ecf13..7c65421 100644 --- a/src/test/scala/scala/async/run/ifelse4/IfElse4.scala +++ b/src/test/scala/scala/async/run/ifelse4/IfElse4.scala @@ -56,7 +56,7 @@ class IfElse4Spec { @Test def `await result with complex type containing skolem`() { val o = new TestIfElse4Class - val fut = o.run(new o.K(null)) + val fut = o.run(o.K(null)) val res = Await.result(fut, 2 seconds) res.id mustBe ("foo") } diff --git a/src/test/scala/scala/async/run/match0/Match0.scala b/src/test/scala/scala/async/run/match0/Match0.scala index 8eead71..c5138ad 100644 --- a/src/test/scala/scala/async/run/match0/Match0.scala +++ b/src/test/scala/scala/async/run/match0/Match0.scala @@ -73,7 +73,7 @@ class MatchSpec { val x = 1 Option(x) match { case op @ Some(x) => - assert(op == Some(1)) + assert(op.contains(1)) x + AsyncId.await(x) case None => AsyncId.await(0) } |