diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 06:54:29 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 06:54:29 +0000 |
| commit | 6b7e6324b460b6f6bea32dc1d15fb3f994569122 (patch) | |
| tree | bd9573d60e871c85e7b7d64c2b6f278483a897e5 /test | |
| parent | 2666cbc045bee377748ef73e47d66751c7a9ecdd (diff) | |
merge revision(s) 49224,49225,49234,49235: [Backport #10711]
* numeric.c (bit_coerce): use original value for error message
[ruby-core:67405] [Bug #10711]
* test/ruby/test_numeric.rb (test_coerce): check error message
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_numeric.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index 66f11ab801..4668f06196 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -5,8 +5,8 @@ class TestNumeric < Test::Unit::TestCase class DummyNumeric < Numeric end - def assert_raise_with_message(exc, pattern, &blk) - e = assert_raise(exc, &blk) + def assert_raise_with_message(exc, pattern, msg = nil, &blk) + e = assert_raise(exc, msg, &blk) assert_match(pattern, e.message) end @@ -38,6 +38,10 @@ class TestNumeric < Test::Unit::TestCase assert_raise_with_message(TypeError, /:"\\u3042"/) {1|:"\u{3042}"} assert_raise_with_message(TypeError, /:"\\u3042"/) {1^:"\u{3042}"} end + + bug10711 = '[ruby-core:67405] [Bug #10711]' + exp = "1.2 can't be coerced into Fixnum" + assert_raise_with_message(TypeError, exp, bug10711) { 1 & 1.2 } end def test_dummynumeric |