diff options
Diffstat (limited to 'src/scalacheck')
-rw-r--r-- | src/scalacheck/org/scalacheck/Arbitrary.scala | 4 | ||||
-rw-r--r-- | src/scalacheck/org/scalacheck/Commands.scala | 4 | ||||
-rw-r--r-- | src/scalacheck/org/scalacheck/ConsoleReporter.scala | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/scalacheck/org/scalacheck/Arbitrary.scala b/src/scalacheck/org/scalacheck/Arbitrary.scala index 14d2b9b924..388c3dccff 100644 --- a/src/scalacheck/org/scalacheck/Arbitrary.scala +++ b/src/scalacheck/org/scalacheck/Arbitrary.scala @@ -98,7 +98,7 @@ object Arbitrary { /** Arbitrary instance of Float */ implicit lazy val arbFloat: Arbitrary[Float] = Arbitrary( Gen.chooseNum( - Float.MinValue, Float.MaxValue + Float.MinNegativeValue, Float.MaxValue // I find that including these by default is a little TOO testy. // Float.Epsilon, Float.NaN, Float.PositiveInfinity, Float.NegativeInfinity ) @@ -107,7 +107,7 @@ object Arbitrary { /** Arbitrary instance of Double */ implicit lazy val arbDouble: Arbitrary[Double] = Arbitrary( Gen.chooseNum( - Double.MinValue / 2, Double.MaxValue / 2 + Double.MinNegativeValue / 2, Double.MaxValue / 2 // As above. Perhaps behind some option? // Double.Epsilon, Double.NaN, Double.PositiveInfinity, Double.NegativeInfinity ) diff --git a/src/scalacheck/org/scalacheck/Commands.scala b/src/scalacheck/org/scalacheck/Commands.scala index 0d16505d96..5602eea151 100644 --- a/src/scalacheck/org/scalacheck/Commands.scala +++ b/src/scalacheck/org/scalacheck/Commands.scala @@ -26,7 +26,7 @@ trait Commands extends Prop { class Binding(private val key: State) { def get: Any = bindings.find(_._1 eq key) match { - case None => error("No value bound") + case None => system.error("No value bound") case Some(x) => x } } @@ -139,7 +139,7 @@ trait Commands extends Prop { case Cmds(Nil, _) => proved case Cmds(c::cs, s::ss) => c.postCondition(s,c.nextState(s),c.run(s)) && runCommands(Cmds(cs,ss)) - case _ => error("Should not be here") + case _ => system.error("Should not be here") } private def commandsProp: Prop = { diff --git a/src/scalacheck/org/scalacheck/ConsoleReporter.scala b/src/scalacheck/org/scalacheck/ConsoleReporter.scala index ed2a08d3ae..5dc02b90ad 100644 --- a/src/scalacheck/org/scalacheck/ConsoleReporter.scala +++ b/src/scalacheck/org/scalacheck/ConsoleReporter.scala @@ -79,10 +79,10 @@ object ConsoleReporter { res.status match { case Test.Proved(_) => {} case Test.Passed => {} - case f @ Test.Failed(_, _) => error(m + f) + case f @ Test.Failed(_, _) => system.error(m + f) case Test.Exhausted => {} - case f @ Test.GenException(_) => error(m + f) - case f @ Test.PropException(_, _, _) => error(m + f) + case f @ Test.GenException(_) => system.error(m + f) + case f @ Test.PropException(_, _, _) => system.error(m + f) } } |