summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorRoland <rk@rkuhn.info>2012-09-19 21:46:04 +0200
committerRoland <rk@rkuhn.info>2012-09-20 13:19:57 +0200
commit05367235ef4c519521cb28073f951e3d55fe3aad (patch)
treefbcd805f07782a251c5ec6e5d97d3dc41ebf6011 /test/files/jvm
parent68c0e596549765a15474b56ab9013ed3ba53b0ce (diff)
downloadscala-05367235ef4c519521cb28073f951e3d55fe3aad.tar.gz
scala-05367235ef4c519521cb28073f951e3d55fe3aad.tar.bz2
scala-05367235ef4c519521cb28073f951e3d55fe3aad.zip
some small remaining fixes
- added test for “span” and “fromNow” qualifiers - make those actually work even when there is an expected type - add ScalaDoc to them - verify (and fix) conversion Deadline -> FiniteDuration - also make Int * Duration => FiniteDuration work (and test it)
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/duration-tck.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/files/jvm/duration-tck.scala b/test/files/jvm/duration-tck.scala
index 40073c0b3f..df1052fed3 100644
--- a/test/files/jvm/duration-tck.scala
+++ b/test/files/jvm/duration-tck.scala
@@ -186,6 +186,9 @@ object Test extends App {
// check statically retaining finite-ness
val finiteDuration: FiniteDuration = 1.second * 2 / 3 mul 5 div 4 plus 3.seconds minus 1.millisecond min 1.second max 1.second
-
+ val finite2: FiniteDuration = 2 * 1.second + 3L * 2.seconds
+ finite2 mustBe 8.seconds
+ ((2 seconds fromNow).timeLeft: FiniteDuration) < 4.seconds mustBe true
+ val finite3: FiniteDuration = 3.5 seconds span
}