diff options
Diffstat (limited to 'test/ruby/test_comparable.rb')
| -rw-r--r-- | test/ruby/test_comparable.rb | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/test/ruby/test_comparable.rb b/test/ruby/test_comparable.rb index e8a2ff1a7a..b689469d9e 100644 --- a/test/ruby/test_comparable.rb +++ b/test/ruby/test_comparable.rb @@ -85,7 +85,13 @@ class TestComparable < Test::Unit::TestCase assert_equal(1, @o.clamp(1, 1)) assert_equal(@o, @o.clamp(0, 0)) - assert_raise_with_message(ArgumentError, 'min argument must be smaller than max argument') { + assert_equal(@o, @o.clamp(nil, 2)) + assert_equal(-2, @o.clamp(nil, -2)) + assert_equal(@o, @o.clamp(-2, nil)) + assert_equal(2, @o.clamp(2, nil)) + assert_equal(@o, @o.clamp(nil, nil)) + + assert_raise_with_message(ArgumentError, 'min argument must be less than or equal to max argument') { @o.clamp(2, 1) } end @@ -99,23 +105,23 @@ class TestComparable < Test::Unit::TestCase assert_equal(1, @o.clamp(1..1)) assert_equal(@o, @o.clamp(0..0)) - assert_equal(1, @o.clamp(1...2)) assert_equal(1, @o.clamp(1..)) assert_equal(1, @o.clamp(1...)) - assert_equal(@o, @o.clamp(0...2)) assert_equal(@o, @o.clamp(0..)) assert_equal(@o, @o.clamp(0...)) assert_equal(@o, @o.clamp(..2)) - assert_equal(@o, @o.clamp(...2)) assert_equal(-1, @o.clamp(-2..-1)) assert_equal(@o, @o.clamp(-2..0)) assert_equal(@o, @o.clamp(-2..)) assert_equal(@o, @o.clamp(-2...)) - assert_raise_with_message(ArgumentError, 'cannot clamp with an exclusive range') { - @o.clamp(-1...0) - } - assert_raise_with_message(ArgumentError, 'min argument must be smaller than max argument') { + exc = [ArgumentError, 'cannot clamp with an exclusive range'] + assert_raise_with_message(*exc) {@o.clamp(1...2)} + assert_raise_with_message(*exc) {@o.clamp(0...2)} + assert_raise_with_message(*exc) {@o.clamp(-1...0)} + assert_raise_with_message(*exc) {@o.clamp(...2)} + + assert_raise_with_message(ArgumentError, 'min argument must be less than or equal to max argument') { @o.clamp(2..1) } end |