diff options
| author | Jeremy Evans <code@jeremyevans.net> | 2020-07-13 10:09:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-13 10:09:38 -0700 |
| commit | 8900a25581822759daca528d46a75e0b743fc22e (patch) | |
| tree | 13625f02dacc53246ea8a2b15810520e2b4746f2 /test/ruby | |
| parent | a1bcfbe30c0bc8dcd4f575e6f74cb92b4453f1ba (diff) | |
Fix Range#{max,minmax} for range with integer beginning and non-integer end
Previously, for inclusive ranges, the max would show up as the
end of the range, even though the end was not an integer and would
not be the maximum value. For exclusive ranges, max/minmax would
previously raise a TypeError, even though it is possible to get the
correct maximum.
This change to max/minmax also uncovered a similar error in cover?,
which calls max in certain cases, so adjust the code there so that
cover? still works as expected.
Fixes [Bug #17017]
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3306
Merged-By: jeremyevans <code@jeremyevans.net>
Diffstat (limited to 'test/ruby')
| -rw-r--r-- | test/ruby/test_range.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index 3953b3ecc2..9052fe6174 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -107,11 +107,13 @@ class TestRange < Test::Unit::TestCase assert_equal(1, (1...2).max) assert_raise(RangeError) { (1..).max } assert_raise(RangeError) { (1...).max } + assert_equal(2, (1..2.1).max) + assert_equal(2, (1...2.1).max) assert_equal(2.0, (1.0..2.0).max) assert_equal(nil, (2.0..1.0).max) assert_raise(TypeError) { (1.0...2.0).max } - assert_raise(TypeError) { (1...1.5).max } + assert_equal(1, (1...1.5).max) assert_raise(TypeError) { (1.5...2).max } assert_equal(-0x80000002, ((-0x80000002)...(-0x80000001)).max) @@ -133,11 +135,13 @@ class TestRange < Test::Unit::TestCase assert_equal([1, 1], (1...2).minmax) assert_raise(RangeError) { (1..).minmax } assert_raise(RangeError) { (1...).minmax } + assert_equal([1, 2], (1..2.1).minmax) + assert_equal([1, 2], (1...2.1).minmax) assert_equal([1.0, 2.0], (1.0..2.0).minmax) assert_equal([nil, nil], (2.0..1.0).minmax) assert_raise(TypeError) { (1.0...2.0).minmax } - assert_raise(TypeError) { (1...1.5).minmax } + assert_equal([1, 1], (1..1.5).minmax) assert_raise(TypeError) { (1.5...2).minmax } assert_equal([-0x80000002, -0x80000002], ((-0x80000002)...(-0x80000001)).minmax) @@ -652,7 +656,12 @@ class TestRange < Test::Unit::TestCase assert_not_operator(1..10, :cover?, 3...2) assert_not_operator(1..10, :cover?, 3...3) assert_not_operator('aa'..'zz', :cover?, 'aa'...'zzz') + assert_not_operator(1..10, :cover?, 1...10.1) + assert_not_operator(1...10.1, :cover?, 1..10.1) + assert_operator(1..10.1, :cover?, 1...10.1) + assert_operator(1..10.1, :cover?, 1...10) + assert_operator(1..10.1, :cover?, 1..10) end def test_beg_len |