summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2017-02-19 15:14:18 +1000
committerGitHub <noreply@github.com>2017-02-19 15:14:18 +1000
commit147e5dd1b88a690b851e57a1783f099cb0dad091 (patch)
tree24c4785205eb5326f8577da41fa5eb6462efa772
parentdb8520e5c45d9ce24912849fad16a5c1b54a09b9 (diff)
parent12437a06d82f193ef5ed82e6c377cd26d17509a8 (diff)
downloadscala-147e5dd1b88a690b851e57a1783f099cb0dad091.tar.gz
scala-147e5dd1b88a690b851e57a1783f099cb0dad091.tar.bz2
scala-147e5dd1b88a690b851e57a1783f099cb0dad091.zip
Merge pull request #5716 from adriaanm/i296
Ensure ordering for args to `choose` in DurationTest
-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 =