* 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, 9 insertions, 16 deletions

diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb
index b45c70ae5e..93a19e86e9 100644
--- a/test/ruby/test_class.rb
+++ b/test/ruby/test_class.rb
@@ -2,10 +2,6 @@ require 'test/unit'
 require_relative 'envutil'
 
 class TestClass < Test::Unit::TestCase
-  def ruby(*r, &b)
-    EnvUtil.rubyexec(*r, &b)
-  end
-
   # ------------------
   # Various test classes
   # ------------------
@@ -133,18 +129,15 @@ class TestClass < Test::Unit::TestCase
     assert_raise(TypeError) { 1.extend(Module.new) }
     assert_raise(TypeError) { :foo.extend(Module.new) }
 
-    ruby do |w, r, e|
-      w.puts "module Foo; def foo; :foo; end; end"
-      w.puts "false.extend(Foo)"
-      w.puts "true.extend(Foo)"
-      w.puts "p false.foo"
-      w.puts "p true.foo"
-      w.puts "p FalseClass.include?(Foo)"
-      w.puts "p TrueClass.include?(Foo)"
-      w.close
-      assert_equal("", e.read)
-      assert_equal(":foo\n:foo\ntrue\ntrue", r.read.chomp)
-    end
+    assert_in_out_err([], <<-INPUT, %w(:foo :foo true true), [])
+      module Foo; def foo; :foo; end; end
+      false.extend(Foo)
+      true.extend(Foo)
+      p false.foo
+      p true.foo
+      p FalseClass.include?(Foo)
+      p TrueClass.include?(Foo)
+    INPUT
   end
 
   def test_uninitialized