summaryrefslogtreecommitdiff
path: root/test/scalacheck
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2017-02-17 14:27:13 -0800
committerAdriaan Moors <adriaan@lightbend.com>2017-02-17 14:28:46 -0800
commit12437a06d82f193ef5ed82e6c377cd26d17509a8 (patch)
tree4b00ef9ad1f08dba25d9901321f64436c6859c33 /test/scalacheck
parent419a6394045a0615cb996152b04c92d25f9fb700 (diff)
downloadscala-12437a06d82f193ef5ed82e6c377cd26d17509a8.tar.gz
scala-12437a06d82f193ef5ed82e6c377cd26d17509a8.tar.bz2
scala-12437a06d82f193ef5ed82e6c377cd26d17509a8.zip
Ensure ordering for args to `choose` in DurationTest
Fix scala/scala-dev#296
Diffstat (limited to 'test/scalacheck')
-rw-r--r--test/scalacheck/duration.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/scalacheck/duration.scala b/test/scalacheck/duration.scala
index 89cb9ff955..fc861b886a 100644
--- a/test/scalacheck/duration.scala
+++ b/test/scalacheck/duration.scala
@@ -32,7 +32,10 @@ object DurationTest extends Properties("Division of Duration by Long") {
val genClose = for {
a <- weightedLong
if a != 0
- b <- choose(Long.MaxValue / a - 10, Long.MaxValue / a + 10)
+ val center = Long.MaxValue / a
+ b <-
+ if (center - 10 < center + 10) choose(center - 10, center + 10)
+ else choose(center + 10, center - 10) // deal with overflow if abs(a) == 1
} yield (a, b)
val genBorderline =