diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-17 15:22:05 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-17 15:22:05 -0700 |
commit | 824e0b47bda251e90af842482baf3cf2bdbb080c (patch) | |
tree | fb64028ca0c896de57c149a086aab23180da7e35 /test/files | |
parent | a404c63d092e1c73fed41fc6ea87a254d5b4e993 (diff) | |
parent | 8e0bc0bffd31d994a6911116f170347004934c55 (diff) | |
download | scala-824e0b47bda251e90af842482baf3cf2bdbb080c.tar.gz scala-824e0b47bda251e90af842482baf3cf2bdbb080c.tar.bz2 scala-824e0b47bda251e90af842482baf3cf2bdbb080c.zip |
Merge pull request #4541 from vuakko/SI-9348_2.11.x
SI-9348 Fix missing last element in exclusive floating point ranges
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/range.scala | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/test/files/run/range.scala b/test/files/run/range.scala index 4637ab874d..e50d0ac6a5 100644 --- a/test/files/run/range.scala +++ b/test/files/run/range.scala @@ -36,16 +36,19 @@ object Test { def gr1 = NumericRange(x, x, x) def gr2 = NumericRange.inclusive(x, x, x) - def gr3 = NumericRange(x, x * fromInt(10), x) - def gr4 = NumericRange.inclusive(x, x * fromInt(10), x) - def gr5 = gr3.toList ::: negated.gr3.toList + def gr3 = NumericRange(x, x * fromInt(4), x * fromInt(2)) // SI-9348 + def gr4 = NumericRange(x, x * fromInt(-2), x * fromInt(-2)) + def gr5 = NumericRange(x, x * fromInt(10), x) + def gr6 = NumericRange.inclusive(x, x * fromInt(10), x) + def gr7 = gr3.toList ::: negated.gr3.toList def check = { assert(gr1.isEmpty && !gr2.isEmpty) - assert(gr3.size == 9 && gr4.size == 10) - assert(gr5.sum == num.zero, gr5.toString) - assert(!(gr3 contains (x * fromInt(10)))) - assert((gr4 contains (x * fromInt(10)))) + assert(gr3.size == 2 && gr4.size == 2) + assert(gr5.size == 9 && gr6.size == 10) + assert(gr7.sum == num.zero, gr7.toString) + assert(!(gr5 contains (x * fromInt(10)))) + assert(gr6 contains (x * fromInt(10))) } } @@ -55,6 +58,7 @@ object Test { val _grs = List[GR[_]]( GR(BigDecimal(5.0)), + GR(BigDecimal(0.25)), // SI-9348 GR(BigInt(5)), GR(5L), GR(5.0d), |