Update test/mri/test_comparable.rb from MRI.

jruby · Dec 27, 2015 · 568ddd8 · 568ddd8
1 parent 8701a48
commit 568ddd8
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/test/mri/ruby/test_comparable.rb b/test/mri/ruby/test_comparable.rb
@@ -1,5 +1,5 @@
+# frozen_string_literal: false
 require 'test/unit'
-require_relative 'envutil'
 
 class TestComparable < Test::Unit::TestCase
   def setup
@@ -18,12 +18,18 @@ def test_equal
     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