From 12437a06d82f193ef5ed82e6c377cd26d17509a8 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan@lightbend.com>
Date: Fri, 17 Feb 2017 14:27:13 -0800
Subject: Ensure ordering for args to `choose` in DurationTest

Fix scala/scala-dev#296
---
 test/scalacheck/duration.scala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'test/scalacheck')

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 =
-- 
cgit v1.2.3