diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 03:05:22 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 03:05:22 +0000 |
| commit | ae6d24859a733b8808f7b2d48b53146a4367f3e8 (patch) | |
| tree | 9d17e05997f7719a53d081489cf7205ecc1e1617 /test | |
| parent | 1872f299e2aaa3c7fd74f59b12dcc63fadda272e (diff) | |
merge revision(s) 46569: [Backport #9982]
* sprintf.c (GETASTER): should not use the numbered argument to be
formatted, raise ArgumentError instead.
[ruby-dev:48330] [Bug #9982]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/envutil.rb | 20 | ||||
| -rw-r--r-- | test/ruby/test_sprintf.rb | 5 |
2 files changed, 25 insertions, 0 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index c330850e5c..52879f8d8a 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -423,6 +423,26 @@ eom clone.tap {|a| a.message = message} end end + + # derived from MiniTest 2.1.0 + def assert_raise_with_message(exception, expected, msg = nil, &block) + case expected + when String + assert = :assert_equal + when Regexp + assert = :assert_match + else + raise TypeError, "Expected #{expected.inspect} to be a kind of String or Regexp, not #{expected.class}" + end + + ex = assert_raise(exception, *msg) { yield } + if assert == :assert_equal + assert_equal(expected, ex.message, msg || "Expected exception(#{exception}) was raised, but the message doesn't match") + else + assert(expected =~ ex.message, msg || "Expected #{expected} to match #{ex.message}") + block.binding.eval("proc{|_|$~=_}").call($~) + end + end end end end diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb index 21329dcd66..b7a29e9ebe 100644 --- a/test/ruby/test_sprintf.rb +++ b/test/ruby/test_sprintf.rb @@ -1,4 +1,5 @@ require 'test/unit' +require_relative 'envutil' class TestSprintf < Test::Unit::TestCase def test_positional @@ -179,6 +180,10 @@ class TestSprintf < Test::Unit::TestCase assert_raise(ArgumentError) { sprintf("%!", 1) } assert_raise(ArgumentError) { sprintf("%1$1$d", 1) } assert_raise(ArgumentError) { sprintf("%0%") } + + assert_raise_with_message(ArgumentError, /unnumbered\(1\) mixed with numbered/) { sprintf("%1$*d", 3) } + assert_raise_with_message(ArgumentError, /unnumbered\(1\) mixed with numbered/) { sprintf("%1$.*d", 3) } + verbose, $VERBOSE = $VERBOSE, nil assert_nothing_raised { sprintf("", 1) } ensure |