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

1 files changed, 20 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