* test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): new

  method.

* test/ruby/test_argf.rb: use assert_in_out_err instead of
  EnvUtil.rubyexec.

* test/ruby/test_module.rb: ditto.

* test/ruby/test_require.rb: ditto.

* test/ruby/test_objectspace.rb: ditto.

* test/ruby/test_object.rb: ditto.

* test/ruby/test_string.rb: ditto.

* test/ruby/test_method.rb: ditto.

* test/ruby/test_variable.rb: ditto.

* test/ruby/test_io.rb: ditto.

* test/ruby/test_rubyoptions.rb: ditto.

* test/ruby/test_exception.rb: ditto.

* test/ruby/test_class.rb: ditto.

* test/ruby/test_thread.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 10 deletions

diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 8ab9a4a965..d978050dc8 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -11,10 +11,6 @@ class TestMethod < Test::Unit::TestCase
     $VERBOSE = @verbose
   end
 
-  def ruby(*r, &b)
-    EnvUtil.rubyexec(*r, &b)
-  end
-
   def m0() end
   def m1(a) end
   def m2(a, b) end
@@ -209,12 +205,7 @@ class TestMethod < Test::Unit::TestCase
   end
 
   def test_callee_top_level
-    ruby do |w, r, e|
-      w.puts "p __callee__"
-      w.close
-      assert_equal("nil", r.read.chomp)
-      assert_match("", e.read.chomp)
-    end
+    assert_in_out_err([], "p __callee__", %w(nil), [])
   end
 
   def test_caller_negative_level