kazu	2012-12-01 02:14:27 +0900 (Sat, 01 Dec 2012)

  New Revision: 38079

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38079

  Log:
    * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): raise if assert_in_out_err misused.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/envutil.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38078)
+++ ChangeLog	(revision 38079)
@@ -1,3 +1,8 @@
+Sat Dec  1 02:04:23 2012  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err):
+	  raise if assert_in_out_err misused.
+
 Sat Dec  1 02:08:16 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/rdoc/test_rdoc_rubygems_hook.rb
Index: test/ruby/envutil.rb
===================================================================
--- test/ruby/envutil.rb	(revision 38078)
+++ test/ruby/envutil.rb	(revision 38079)
@@ -166,6 +166,8 @@
       def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil, opt={})
         stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, opt)
         if block_given?
+          raise "test_stdout ignored, use block only or without block" if test_stdout != []
+          raise "test_stderr ignored, use block only or without block" if test_stderr != []
           yield(stdout.lines.map {|l| l.chomp }, stderr.lines.map {|l| l.chomp })
         else
           if test_stdout.is_a?(Regexp)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/