From 6c1bfbe478c5b7698ba9c96e61a2a597b44d4d16 Mon Sep 17 00:00:00 2001 From: knu Date: Sat, 24 Nov 2012 17:14:06 +0000 Subject: Fix tests of rb_warning(). * test/ruby/envutil.rb (Test::Unit::Assertions#assert_warning) (Test::Unit::Assertions#assert_warn), test/ruby/envutil.rb, test/ruby/test_enumerator.rb, test/ruby/test_io_m17n.rb, test/ruby/test_regexp.rb, test/ruby/test_syntax.rb: assert_warn() and assert_warning() are reversed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/envutil.rb | 6 +++--- test/ruby/test_enumerator.rb | 4 ++-- test/ruby/test_io_m17n.rb | 12 ++++++------ test/ruby/test_regexp.rb | 24 ++++++++++++------------ test/ruby/test_syntax.rb | 8 ++++---- 5 files changed, 27 insertions(+), 27 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 780196a438..8b57c28e08 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -187,15 +187,15 @@ module Test assert(status.success?, m) end - def assert_warn(pat, message = nil) + def assert_warning(pat, message = nil) stderr = EnvUtil.verbose_warning { yield } message = ' "' + message + '"' if message msg = proc {"warning message #{stderr.inspect} is expected to match #{pat.inspect}#{message}"} assert(pat === stderr, msg) end - def assert_warning(*args) - assert_warn(*args) {$VERBOSE = false; yield} + def assert_warn(*args) + assert_warning(*args) {$VERBOSE = false; yield} end def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.5) diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index 896bf3f3f2..d66d7d0500 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -367,8 +367,8 @@ class TestEnumerator < Test::Unit::TestCase def test_inspect_verbose bug6214 = '[ruby-dev:45449]' - assert_warn("", bug6214) { "".bytes.inspect } - assert_warn("", bug6214) { [].lazy.inspect } + assert_warning("", bug6214) { "".bytes.inspect } + assert_warning("", bug6214) { [].lazy.inspect } end def test_generator diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index 3cc84374be..becafaa201 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -989,24 +989,24 @@ EOT #bug5568 = '[ruby-core:40727]' bug6324 = '[ruby-core:44455]' open(__FILE__, "r") do |f| - assert_warn('', bug6324) { + assert_warning('', bug6324) { f.set_encoding("eucjp:euc-jp") } - assert_warn('', bug6324) { + assert_warning('', bug6324) { f.set_encoding("eucjp", "euc-jp") } - assert_warn('', bug6324) { + assert_warning('', bug6324) { f.set_encoding(Encoding::EUC_JP, "euc-jp") } - assert_warn('', bug6324) { + assert_warning('', bug6324) { f.set_encoding("eucjp", Encoding::EUC_JP) } - assert_warn('', bug6324) { + assert_warning('', bug6324) { f.set_encoding(Encoding::EUC_JP, Encoding::EUC_JP) } nonstr = Object.new def nonstr.to_str; "eucjp"; end - assert_warn('', bug6324) { + assert_warning('', bug6324) { f.set_encoding(nonstr, nonstr) } end diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index de89a67289..03c7fd4443 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -888,18 +888,18 @@ class TestRegexp < Test::Unit::TestCase end def test_dup_warn - assert_warn(/duplicated/) { Regexp.new('[\u3042\u3043\u3042]') } - assert_warn(/duplicated/) { Regexp.new('[\u3042\u3043\u3043]') } - assert_warn(/\A\z/) { Regexp.new('[\u3042\u3044\u3043]') } - assert_warn(/\A\z/) { Regexp.new('[\u3042\u3045\u3043]') } - assert_warn(/\A\z/) { Regexp.new('[\u3042\u3045\u3044]') } - assert_warn(/\A\z/) { Regexp.new('[\u3042\u3045\u3043-\u3044]') } - assert_warn(/duplicated/) { Regexp.new('[\u3042\u3045\u3042-\u3043]') } - assert_warn(/duplicated/) { Regexp.new('[\u3042\u3045\u3044-\u3045]') } - assert_warn(/\A\z/) { Regexp.new('[\u3042\u3046\u3044]') } - assert_warn(/duplicated/) { Regexp.new('[\u1000-\u2000\u3042-\u3046\u3044]') } - assert_warn(/duplicated/) { Regexp.new('[\u3044\u3041-\u3047]') } - assert_warn(/duplicated/) { Regexp.new('[\u3042\u3044\u3046\u3041-\u3047]') } + assert_warning(/duplicated/) { Regexp.new('[\u3042\u3043\u3042]') } + assert_warning(/duplicated/) { Regexp.new('[\u3042\u3043\u3043]') } + assert_warning(/\A\z/) { Regexp.new('[\u3042\u3044\u3043]') } + assert_warning(/\A\z/) { Regexp.new('[\u3042\u3045\u3043]') } + assert_warning(/\A\z/) { Regexp.new('[\u3042\u3045\u3044]') } + assert_warning(/\A\z/) { Regexp.new('[\u3042\u3045\u3043-\u3044]') } + assert_warning(/duplicated/) { Regexp.new('[\u3042\u3045\u3042-\u3043]') } + assert_warning(/duplicated/) { Regexp.new('[\u3042\u3045\u3044-\u3045]') } + assert_warning(/\A\z/) { Regexp.new('[\u3042\u3046\u3044]') } + assert_warning(/duplicated/) { Regexp.new('[\u1000-\u2000\u3042-\u3046\u3044]') } + assert_warning(/duplicated/) { Regexp.new('[\u3044\u3041-\u3047]') } + assert_warning(/duplicated/) { Regexp.new('[\u3042\u3044\u3046\u3041-\u3047]') } end def test_property_warn diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 49522c42cd..ec3af712f4 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -111,13 +111,13 @@ class TestSyntax < Test::Unit::TestCase def test_warn_grouped_expression bug5214 = '[ruby-core:39050]' - assert_warn("", bug5214) do + assert_warning("", bug5214) do assert_valid_syntax("foo \\\n(\n true)", "test") {$VERBOSE = true} end end def test_warn_unreachable - assert_warn("test:3: warning: statement not reached\n") do + assert_warning("test:3: warning: statement not reached\n") do code = "loop do\n" "break\n" "foo\n" "end" assert_valid_syntax(code, "test") {$VERBOSE = true} end @@ -150,7 +150,7 @@ class TestSyntax < Test::Unit::TestCase def test_duplicated_when w = 'warning: duplicated when clause is ignored' - assert_warn(/3: #{w}.+4: #{w}.+4: #{w}.+5: #{w}.+5: #{w}/m){ + assert_warning(/3: #{w}.+4: #{w}.+4: #{w}.+5: #{w}.+5: #{w}/m){ eval %q{ case 1 when 1, 1 @@ -159,7 +159,7 @@ class TestSyntax < Test::Unit::TestCase end } } - assert_warn(/#{w}/){#/3: #{w}.+4: #{w}.+5: #{w}.+5: #{w}/m){ + assert_warning(/#{w}/){#/3: #{w}.+4: #{w}.+5: #{w}.+5: #{w}/m){ a = 1 eval %q{ case 1 -- cgit v1.2.3