1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

assert_warn, assert_warning

Browse Source 
* test/ruby/envutil.rb (assert_warn): add optional message argument.

* test/ruby/envutil.rb (assert_warning): moved from test_io_m17n.rb

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-13 03:34:11 +00:00
parent 7e82db2e1e
commit 826cdd67a0
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/ruby/envutil.rb
View File

@ -179,9 +179,14 @@ module Test
assert(status.success?, m) assert(status.success?, m)
end end
def assert_warn(msg) def assert_warn(pat, message = nil)
message ||= proc {"warning message #{stderr.inspect} is expected to match #{pat.inspect}"}
stderr = EnvUtil.verbose_warning { yield } stderr = EnvUtil.verbose_warning { yield }
assert(msg === stderr, "warning message #{stderr.inspect} is expected to match #{msg.inspect}") assert(pat === stderr, message)
end
def assert_warning(*args)
assert_warn(*args) {$VERBOSE = false; yield}
end end
def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.5) def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.5)

12
test/ruby/test_io_m17n.rb
View File

@ -1,7 +1,6 @@
require 'test/unit' require 'test/unit'
require 'tmpdir' require 'tmpdir'
require 'timeout' require 'timeout'
require 'stringio'
require_relative 'envutil' require_relative 'envutil'
class TestIO_M17N < Test::Unit::TestCase class TestIO_M17N < Test::Unit::TestCase
@ -12,17 +11,6 @@ class TestIO_M17N < Test::Unit::TestCase
Encoding::UTF_8 Encoding::UTF_8
] ]
def assert_warning(pat, mesg=nil)
begin
org_stderr = $stderr
$stderr = StringIO.new(warn = '')
yield
ensure
$stderr = org_stderr
end
assert_match(pat, warn, mesg)
end
def with_tmpdir def with_tmpdir
Dir.mktmpdir {|dir| Dir.mktmpdir {|dir|
Dir.chdir(dir) { Dir.chdir(dir) {