From bcb5c27fc44375cde4d045f06254c58aa929e883 Mon Sep 17 00:00:00 2001 From: marcandre Date: Sat, 30 Mar 2013 04:33:28 +0000 Subject: * test/ruby/test_class.rb: Simplify warning checks * test/ruby/test_io.rb: ditto * test/ruby/test_module.rb: ditto * test/ruby/test_regexp.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_class.rb | 12 ++++-------- test/ruby/test_io.rb | 9 +++------ test/ruby/test_module.rb | 39 +++++++++++++-------------------------- test/ruby/test_regexp.rb | 4 +--- 4 files changed, 21 insertions(+), 43 deletions(-) diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb index ef7d4fa922..7aed078654 100644 --- a/test/ruby/test_class.rb +++ b/test/ruby/test_class.rb @@ -118,23 +118,21 @@ class TestClass < Test::Unit::TestCase assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr) assert_match(/:#{line-1}: warning: previous definition of foo/, stderr, feature2155) - stderr = EnvUtil.verbose_warning do + assert_warning '' do Class.new do def foo; end alias bar foo def foo; end end end - assert_equal("", stderr) - stderr = EnvUtil.verbose_warning do + assert_warning '' do Class.new do def foo; end alias bar foo alias bar foo end end - assert_equal("", stderr) line = __LINE__+4 stderr = EnvUtil.verbose_warning do @@ -146,22 +144,20 @@ class TestClass < Test::Unit::TestCase assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr) assert_match(/:#{line-1}: warning: previous definition of foo/, stderr, feature2155) - stderr = EnvUtil.verbose_warning do + assert_warning '' do Class.new do define_method(:foo) do end alias bar foo alias bar foo end end - assert_equal("", stderr) - stderr = EnvUtil.verbose_warning do + assert_warning '' do Class.new do def foo; end undef foo end end - assert_equal("", stderr) end def test_check_inheritable diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index c19b1608df..8ccb5de03b 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2396,20 +2396,17 @@ End end def test_warn - stderr = EnvUtil.verbose_warning do + assert_warning "warning\n" do warn "warning" end - assert_equal("warning\n", stderr) - stderr = EnvUtil.verbose_warning do + assert_warning '' do warn end - assert_equal("", stderr) - stderr = EnvUtil.verbose_warning do + assert_warning "[Feature #5029]\n[ruby-core:38070]\n" do warn "[Feature #5029]", "[ruby-core:38070]" end - assert_equal("[Feature #5029]\n[ruby-core:38070]\n", stderr) end def test_cloexec diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index fa7484b10a..8e2d5f6333 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1067,23 +1067,21 @@ class TestModule < Test::Unit::TestCase assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr) assert_match(/:#{line-1}: warning: previous definition of foo/, stderr, feature2155) - stderr = EnvUtil.verbose_warning do + assert_warning '' do Module.new do def foo; end alias bar foo def foo; end end end - assert_equal("", stderr) - stderr = EnvUtil.verbose_warning do + assert_warning '' do Module.new do def foo; end alias bar foo alias bar foo end end - assert_equal("", stderr) line = __LINE__+4 stderr = EnvUtil.verbose_warning do @@ -1095,31 +1093,28 @@ class TestModule < Test::Unit::TestCase assert_match(/:#{line}: warning: method redefined; discarding old foo/, stderr) assert_match(/:#{line-1}: warning: previous definition of foo/, stderr, feature2155) - stderr = EnvUtil.verbose_warning do + assert_warning '' do Module.new do define_method(:foo) do end alias bar foo alias bar foo end end - assert_equal("", stderr) - stderr = EnvUtil.verbose_warning do + assert_warning('', '[ruby-dev:39397]') do Module.new do module_function def foo; end module_function :foo end end - assert_equal("", stderr, '[ruby-dev:39397]') - stderr = EnvUtil.verbose_warning do + assert_warning '' do Module.new do def foo; end undef foo end end - assert_equal("", stderr) end def test_protected_singleton_method @@ -1592,55 +1587,47 @@ class TestModule < Test::Unit::TestCase def test_uninitialized_instance_variable a = AttrTest.new - stderr = EnvUtil.verbose_warning do + assert_warning /instance variable @ivar not initialized/ do assert_nil(a.ivar) end - assert_match(/instance variable @ivar not initialized/, stderr) a.instance_variable_set(:@ivar, 42) - stderr = EnvUtil.verbose_warning do + assert_warning '' do assert_equal(42, a.ivar) end - assert_equal("", stderr) end def test_uninitialized_attr a = AttrTest.new - stderr = EnvUtil.verbose_warning do + assert_warning '' do assert_nil(a.iattr) end - assert_equal("", stderr) a.iattr = 42 - stderr = EnvUtil.verbose_warning do + assert_warning '' do assert_equal(42, a.iattr) end - assert_equal("", stderr) end def test_uninitialized_attr_class - stderr = EnvUtil.verbose_warning do + assert_warning '' do assert_nil(AttrTest.cattr) end - assert_equal("", stderr) AttrTest.cattr = 42 - stderr = EnvUtil.verbose_warning do + assert_warning '' do assert_equal(42, AttrTest.cattr) end - assert_equal("", stderr) end def test_uninitialized_attr_non_object a = Class.new(Array) do attr_accessor :iattr end.new - stderr = EnvUtil.verbose_warning do + assert_warning '' do assert_nil(a.iattr) end - assert_equal("", stderr) a.iattr = 42 - stderr = EnvUtil.verbose_warning do + assert_warning '' do assert_equal(42, a.iattr) end - assert_equal("", stderr) end def test_remove_const diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index 46fd4531a0..e17cd6f962 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -914,9 +914,7 @@ class TestRegexp < Test::Unit::TestCase assert_warning(/duplicated/) { Regexp.new('[\u3042\u3044\u3046\u3041-\u3047]') } bug7471 = '[ruby-core:50344]' - EnvUtil.verbose_warning do - assert_warning(/\A\z/, bug7471) { Regexp.new('[\D]') =~ "\u3042" } - end + assert_warning('', bug7471) { Regexp.new('[\D]') =~ "\u3042" } end def test_property_warn -- cgit v1.2.3