diff options
Diffstat (limited to 'test/ruby/test_exception.rb')
-rw-r--r-- | test/ruby/test_exception.rb | 73 |
1 files changed, 25 insertions, 48 deletions
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 6c2cedd242..3300fcdd74 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -2,10 +2,6 @@ require 'test/unit' require_relative 'envutil' class TestException < Test::Unit::TestCase - def ruby(*r, &b) - EnvUtil.rubyexec(*r, &b) - end - def test_exception begin raise "this must be handled" @@ -197,53 +193,34 @@ class TestException < Test::Unit::TestCase end def test_errat - ruby do |w, r, e| - w.puts "p $@" - w.close - assert_equal("nil", r.read.chomp) - assert_equal("", e.read.chomp) - end + assert_in_out_err([], "p $@", %w(nil), []) - ruby do |w, r, e| - w.puts "$@ = 1" - w.close - assert_equal("", r.read.chomp) - assert_match(/\$! not set \(ArgumentError\)$/, e.read.chomp) - end + assert_in_out_err([], "$@ = 1", [], /\$! not set \(ArgumentError\)$/) - ruby do |w, r, e| - w.puts "begin" - w.puts " raise" - w.puts "rescue" - w.puts " $@ = 1" - w.puts "end" - w.close - assert_equal("", r.read.chomp) - assert_match(/backtrace must be Array of String \(TypeError\)$/, e.read.chomp) - end + assert_in_out_err([], <<-INPUT, [], /backtrace must be Array of String \(TypeError\)$/) + begin + raise + rescue + $@ = 1 + end + INPUT - ruby do |w, r, e| - w.puts "begin" - w.puts " raise" - w.puts "rescue" - w.puts " $@ = 'foo'" - w.puts " raise" - w.puts "end" - w.close - assert_equal("", r.read.chomp) - assert_match(/^foo: unhandled exception$/, e.read.chomp) - end + assert_in_out_err([], <<-INPUT, [], /^foo: unhandled exception$/) + begin + raise + rescue + $@ = 'foo' + raise + end + INPUT - ruby do |w, r, e| - w.puts "begin" - w.puts " raise" - w.puts "rescue" - w.puts " $@ = %w(foo bar baz)" - w.puts " raise" - w.puts "end" - w.close - assert_equal("", r.read.chomp) - assert_match(/^foo: unhandled exception\s+from bar\s+from baz$/, e.read.chomp) - end + assert_in_out_err([], <<-INPUT, [], /^foo: unhandled exception\s+from bar\s+from baz$/) + begin + raise + rescue + $@ = %w(foo bar baz) + raise + end + INPUT end end |