diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-10-20 18:00:16 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-10-20 18:00:16 -0700 |
| commit | 117bb2ac30a00f56e168f804a1561de1369ee944 (patch) | |
| tree | 34669ca0f1719c5397c475cfb3f866f8b55f54de /test | |
| parent | c9229bc8495fa306400e2e6db5fff02b6f16cfce (diff) | |
| parent | 74357d11837939f16820623e6a7a5e3483335b4c (diff) | |
| download | scala-117bb2ac30a00f56e168f804a1561de1369ee944.tar.gz scala-117bb2ac30a00f56e168f804a1561de1369ee944.tar.bz2 scala-117bb2ac30a00f56e168f804a1561de1369ee944.zip | |
Merge pull request #1510 from rkuhn/wip-duration-tck-one-arg-assert
avoid single-arg assert where harmful in duration-tck
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/jvm/duration-tck.scala | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/files/jvm/duration-tck.scala b/test/files/jvm/duration-tck.scala index df1052fed3..d0f13816a6 100644 --- a/test/files/jvm/duration-tck.scala +++ b/test/files/jvm/duration-tck.scala @@ -170,11 +170,14 @@ object Test extends App { // test Deadline val dead = 2.seconds.fromNow val dead2 = 2 seconds fromNow - assert(dead.timeLeft > 1.second) - assert(dead2.timeLeft > 1.second) + + { val l = dead.timeLeft; assert(l > 1.second, s"$l <= 1.second") } + { val l = dead2.timeLeft; assert(l > 1.second, s"$l <= 1.second") } + Thread.sleep(1.second.toMillis) - assert(dead.timeLeft < 1.second) - assert(dead2.timeLeft < 1.second) + + { val l = dead.timeLeft; assert(l <= 1.second, s"$l > 1.second") } + { val l = dead2.timeLeft; assert(l <= 1.second, s"$l > 1.second") } // test integer mul/div |