Add Double infinities to Gen.choose

Author: ashawley

jvm/src/test/scala/org/scalacheck/GenSpecification.scala

@@ -123,6 +123,12 @@ object GenSpecification extends Properties("Gen") {
 
   import Double.{NegativeInfinity, PositiveInfinity}
   property("choose-infinite-double") = {
+    forAll(Gen.choose(NegativeInfinity, PositiveInfinity)) { x =>
+      NegativeInfinity <= x && x <= PositiveInfinity && !x.isNaN
+    }
+  }
+
+  property("choose-infinite-double-fix-zero-defect-379") = {
     Prop.forAllNoShrink(listOfN(3, choose(NegativeInfinity, PositiveInfinity))) { xs =>
       xs.exists(_ != 0d)
     }

src/main/scala/org/scalacheck/Gen.scala

@@ -377,10 +377,6 @@ object Gen extends GenArities{
       val d = h - l
       if (d < 0) {
         throw new IllegalBoundsError(l, h)
-      } else if (l == Double.NegativeInfinity) {
-        chDbl(Double.MinValue, h)(p, seed)
-      } else if (h == Double.PositiveInfinity) {
-        chDbl(l, Double.MaxValue)(p, seed)
       } else if (d > Double.MaxValue) {
         val (x, seed2) = seed.long
         if (x < 0) chDbl(l, 0d)(p, seed2) else chDbl(0d, h)(p, seed2)
@@ -414,6 +410,12 @@ object Gen extends GenArities{
       new Choose[Double] {
         def choose(low: Double, high: Double) =
           if (low > high) throw new IllegalBoundsError(low, high)
+          else if (low == Double.NegativeInfinity)
+            frequency(1 -> Double.NegativeInfinity,
+                      9 -> choose(Double.MinValue, high))
+          else if (high == Double.PositiveInfinity)
+            frequency(1 -> Double.PositiveInfinity,
+                      9 -> choose(low, Double.MaxValue))
           else gen(chDbl(low,high))
       }