1 files changed, 61 insertions, 4 deletions
diff --git a/test/ruby/test_comparable.rb b/test/ruby/test_comparable.rb
index efa630f8d9..b689469d9e 100644
--- a/test/ruby/test_comparable.rb
+++ b/test/ruby/test_comparable.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'test/unit'
 
 class TestComparable < Test::Unit::TestCase
@@ -17,12 +18,18 @@ class TestComparable < Test::Unit::TestCase
     assert_equal(true, @o == nil)
     cmp->(x) do 1; end
     assert_equal(false, @o == nil)
+    cmp->(x) do nil; end
+    assert_equal(false, @o == nil)
+
     cmp->(x) do raise NotImplementedError, "Not a RuntimeError" end
     assert_raise(NotImplementedError) { @o == nil }
-    bug7688 = '[ruby-core:51389] [Bug #7688]'
-    cmp->(x) do raise StandardError, "A standard error should be rescued"; end
-    warn = /Comparable#== will no more rescue exceptions .+ in the next release/
-    assert_warn(warn, bug7688) { @o == nil }
+
+    bug7688 = 'Comparable#== should not silently rescue' \
+              'any Exception [ruby-core:51389] [Bug #7688]'
+    cmp->(x) do raise StandardError end
+    assert_raise(StandardError, bug7688) { @o == nil }
+    cmp->(x) do "bad value"; end
+    assert_raise(ArgumentError, bug7688) { @o == nil }
   end
 
   def test_gt
@@ -69,6 +76,56 @@ class TestComparable < Test::Unit::TestCase
     assert_equal(true, @o.between?(0, 0))
   end
 
+  def test_clamp
+    cmp->(x) do 0 <=> x end
+    assert_equal(1, @o.clamp(1, 2))
+    assert_equal(-1, @o.clamp(-2, -1))
+    assert_equal(@o, @o.clamp(-1, 3))
+
+    assert_equal(1, @o.clamp(1, 1))
+    assert_equal(@o, @o.clamp(0, 0))
+
+    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
+
+  def test_clamp_with_range
+    cmp->(x) do 0 <=> x end
+    assert_equal(1, @o.clamp(1..2))
+    assert_equal(-1, @o.clamp(-2..-1))
+    assert_equal(@o, @o.clamp(-1..3))
+
+    assert_equal(1, @o.clamp(1..1))
+    assert_equal(@o, @o.clamp(0..0))
+
+    assert_equal(1, @o.clamp(1..))
+    assert_equal(1, @o.clamp(1...))
+    assert_equal(@o, @o.clamp(0..))
+    assert_equal(@o, @o.clamp(0...))
+    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...))
+
+    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
+
   def test_err
     assert_raise(ArgumentError) { 1.0 < nil }
     assert_raise(ArgumentError) { 1.0 < Object.new }