diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-22 16:41:40 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-22 16:42:20 +0200 |
| commit | b4cc68a79d70fe8911073c608aa6767244fe28de (patch) | |
| tree | ca7e4df33c4e5404f18e0b664e28c7c8bc4e3375 /test/files/scalacheck | |
| parent | cd2bbaaf70d2f35e23c0bd5f5c84240fa1c22d3f (diff) | |
| parent | 03aaf05edda92344acc642fb9e58546a8a37d33c (diff) | |
| download | scala-b4cc68a79d70fe8911073c608aa6767244fe28de.tar.gz scala-b4cc68a79d70fe8911073c608aa6767244fe28de.tar.bz2 scala-b4cc68a79d70fe8911073c608aa6767244fe28de.zip | |
Merge commit '03aaf05' into merge-2.11-to-2.12-sep-22
Diffstat (limited to 'test/files/scalacheck')
| -rw-r--r-- | test/files/scalacheck/range.scala | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/test/files/scalacheck/range.scala b/test/files/scalacheck/range.scala index 493083a51f..ac24b52f8d 100644 --- a/test/files/scalacheck/range.scala +++ b/test/files/scalacheck/range.scala @@ -134,7 +134,22 @@ abstract class RangeTest(kind: String) extends Properties("Range "+kind) { val expected = r.length match { case 0 => 0 case 1 => r.head - case _ => ((r.head + r.last).toLong * r.length / 2).toInt + case x if x < 1000 => + // Explicit sum, to guard against having the same mistake in both the + // range implementation and test implementation of sum formula. + // (Yes, this happened before.) + var i = r.head + var s = 0L + var n = x + while (n > 0) { + s += i + i += r.step + n -= 1 + } + s.toInt + case _ => + // Make sure head + last doesn't overflow! + ((r.head.toLong + r.last) * r.length / 2).toInt } // println("size: " + r.length) // println("expected: " + expected) |