diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-10-01 13:18:44 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-10-01 13:18:44 +1000 |
commit | d98bcdc81f9730e17cb5a46d390c0835ca298966 (patch) | |
tree | 145ab5ef3ffe4cb3530327d6a8e2876a1f1982b7 /src/test/scala/scala/async | |
parent | 0f8ea5cc046f30f28975556ec37855e3ef5a2c69 (diff) | |
parent | b420446c9f82176e7fe4973576fb2d7f22b28893 (diff) | |
download | scala-async-d98bcdc81f9730e17cb5a46d390c0835ca298966.tar.gz scala-async-d98bcdc81f9730e17cb5a46d390c0835ca298966.tar.bz2 scala-async-d98bcdc81f9730e17cb5a46d390c0835ca298966.zip |
Merge branch 'ticket/86-mkZero' into merge/2.10.x-to-master-20140930
Conflicts:
src/main/scala/scala/async/internal/AnfTransform.scala
src/main/scala/scala/async/internal/AsyncTransform.scala
src/test/scala/scala/async/run/toughtype/ToughType.scala
Diffstat (limited to 'src/test/scala/scala/async')
-rw-r--r-- | src/test/scala/scala/async/run/toughtype/ToughType.scala | 53 |
1 files changed, 51 insertions, 2 deletions
diff --git a/src/test/scala/scala/async/run/toughtype/ToughType.scala b/src/test/scala/scala/async/run/toughtype/ToughType.scala index 5ff1605..aedaf10 100644 --- a/src/test/scala/scala/async/run/toughtype/ToughType.scala +++ b/src/test/scala/scala/async/run/toughtype/ToughType.scala @@ -239,10 +239,59 @@ class ToughTypeSpec { val result = Await.result(f, 5.seconds) result mustEqual (new IntWrapper("foo")) } -} -class IntWrapper(val value: String) extends AnyVal + @Test def ticket86NestedValueClass() { + import ExecutionContext.Implicits.global + + val f = async { + val a = Future.successful(new IntWrapper("42")) + await(await(a).plusStr) + } + val result = Await.result(f, 5.seconds) + result mustEqual "42!" + } + + @Test def ticket86MatchedValueClass(): Unit = { + import ExecutionContext.Implicits.global + + def doAThing(param: IntWrapper) = Future(None) + + val fut = async { + Option(new IntWrapper("value!")) match { + case Some(valueHolder) => + await(doAThing(valueHolder)) + case None => + None + } + } + + val result = Await.result(fut, 5.seconds) + result mustBe None + } + + @Test def ticket86MatchedParameterizedValueClass(): Unit = { + import ExecutionContext.Implicits.global + def doAThing(param: ParamWrapper[String]) = Future(None) + + val fut = async { + Option(new ParamWrapper("value!")) match { + case Some(valueHolder) => + await(doAThing(valueHolder)) + case None => + None + } + } + + val result = Await.result(fut, 5.seconds) + result mustBe None + } +} + +class IntWrapper(val value: String) extends AnyVal { + def plusStr = Future.successful(value + "!") +} +class ParamWrapper[T](val value: T) extends AnyVal trait A |