From 07b10cd59f372498e43d7bb10ce019e782c7a548 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 29 Nov 2012 07:01:46 +0000 Subject: [PATCH] * lib/rdoc/test_case.rb (RDoc::TestCase#verbose_capture_io): defined for asserts of warnings. * test/rdoc: use verbose_capture_io on asserts of warnings. they failed when tests was run with RUBYOPT=-W0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ lib/rdoc/test_case.rb | 14 ++++++++++++++ test/rdoc/test_rdoc_context.rb | 2 +- test/rdoc/test_rdoc_context_section.rb | 2 +- test/rdoc/test_rdoc_encoding.rb | 4 ++-- test/rdoc/test_rdoc_options.rb | 4 ++-- test/rdoc/test_rdoc_parser_c.rb | 10 +++++----- test/rdoc/test_rdoc_rdoc.rb | 2 +- test/rdoc/test_rdoc_task.rb | 4 ++-- test/rdoc/test_rdoc_text.rb | 2 +- 10 files changed, 37 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index d41409044c..4e76e9fca6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Nov 29 15:56:14 2012 NARUSE, Yui + + * lib/rdoc/test_case.rb (RDoc::TestCase#verbose_capture_io): + defined for asserts of warnings. + + * test/rdoc: use verbose_capture_io on asserts of warnings. + they failed when tests was run with RUBYOPT=-W0. + Thu Nov 29 15:53:38 2012 NAKAMURA Usaku * ext/psych/extconf.rb: added --enable-bundled-libyaml option. this diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb index c2eb855d83..e5b7288e5a 100644 --- a/lib/rdoc/test_case.rb +++ b/lib/rdoc/test_case.rb @@ -151,6 +151,20 @@ class RDoc::TestCase < MiniTest::Unit::TestCase @RM::Verbatim.new(*parts) end + ## + # run capture_io with setting $VERBOSE = true + + def verbose_capture_io + capture_io do + begin + orig_verbose = $VERBOSE + $VERBOSE = true + yield + ensure + $VERBOSE = orig_verbose + end + end + end end # This hack allows autoload to work when Dir.pwd is changed for Ruby 1.8 since diff --git a/test/rdoc/test_rdoc_context.rb b/test/rdoc/test_rdoc_context.rb index bd0baaa725..a4f42ad206 100644 --- a/test/rdoc/test_rdoc_context.rb +++ b/test/rdoc/test_rdoc_context.rb @@ -230,7 +230,7 @@ class TestRDocContext < XrefTestCase meth2.record_location @store.add_file 'second.rb' meth2.comment = comment 'second' - _, err = capture_io do + _, err = verbose_capture_io do @context.add_method meth2 end diff --git a/test/rdoc/test_rdoc_context_section.rb b/test/rdoc/test_rdoc_context_section.rb index 716d3ae6bb..d492c17048 100644 --- a/test/rdoc/test_rdoc_context_section.rb +++ b/test/rdoc/test_rdoc_context_section.rb @@ -126,7 +126,7 @@ class TestRDocContextSection < RDoc::TestCase end def test_sequence - _, err = capture_io do + _, err = verbose_capture_io do assert_match(/\ASEC\d{5}\Z/, @s.sequence) end diff --git a/test/rdoc/test_rdoc_encoding.rb b/test/rdoc/test_rdoc_encoding.rb index d43bc2e244..8b482b67f2 100644 --- a/test/rdoc/test_rdoc_encoding.rb +++ b/test/rdoc/test_rdoc_encoding.rb @@ -53,7 +53,7 @@ class TestRDocEncoding < RDoc::TestCase contents = :junk - _, err = capture_io do + _, err = verbose_capture_io do contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII end @@ -104,7 +104,7 @@ class TestRDocEncoding < RDoc::TestCase @tempfile.flush contents = :junk - _, err = capture_io do + _, err = verbose_capture_io do contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8 end diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb index 14ccd0de0f..7fa0c10869 100644 --- a/test/rdoc/test_rdoc_options.rb +++ b/test/rdoc/test_rdoc_options.rb @@ -45,7 +45,7 @@ class TestRDocOptions < RDoc::TestCase def test_check_files_warn @options.verbosity = 2 - out, err = capture_io do + out, err = verbose_capture_io do @options.files = %w[nonexistent] @options.check_files @@ -572,7 +572,7 @@ rdoc_include: @options.verbosity = 2 - out, err = capture_io do + out, err = verbose_capture_io do @options.warn "warnings on" end diff --git a/test/rdoc/test_rdoc_parser_c.rb b/test/rdoc/test_rdoc_parser_c.rb index 4e5e6ab1a2..f2e2473cfa 100644 --- a/test/rdoc/test_rdoc_parser_c.rb +++ b/test/rdoc/test_rdoc_parser_c.rb @@ -244,7 +244,7 @@ void Init_Blah(void) { } EOF - _, err = capture_io do + _, err = verbose_capture_io do refute util_get_class(content, 'cDate') end @@ -549,7 +549,7 @@ void Init_Blah(void) { klass = nil - _, err = capture_io do + _, err = verbose_capture_io do klass = util_get_class content, 'cDate' end @@ -571,7 +571,7 @@ void Init_Blah(void) { klass = nil - _, err = capture_io do + _, err = verbose_capture_io do klass = util_get_class content, 'cDate' end @@ -593,7 +593,7 @@ void Init_Blah(void) { klass = nil - _, err = capture_io do + _, err = verbose_capture_io do klass = util_get_class content, 'cDate' end @@ -659,7 +659,7 @@ void Init_Blah(void) { parser.missing_dependencies['y'] = ['y', :class, 'Y', 'Object', 'z'] parser.missing_dependencies['z'] = ['z', :class, 'Z', 'Object', 'y'] - _, err = capture_io do + _, err = verbose_capture_io do parser.do_missing end diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb index 5ed7ce77b0..5519ed36ac 100644 --- a/test/rdoc/test_rdoc_rdoc.rb +++ b/test/rdoc/test_rdoc_rdoc.rb @@ -128,7 +128,7 @@ class TestRDocRDoc < RDoc::TestCase files = nil - out, err = capture_io do + out, err = verbose_capture_io do files = @rdoc.normalized_file_list %w[/dev/stdin] end diff --git a/test/rdoc/test_rdoc_task.rb b/test/rdoc/test_rdoc_task.rb index dce02bc9b7..8faf3f7d92 100644 --- a/test/rdoc/test_rdoc_task.rb +++ b/test/rdoc/test_rdoc_task.rb @@ -16,13 +16,13 @@ class TestRDocTask < RDoc::TestCase end def test_inline_source - _, err = capture_io do + _, err = verbose_capture_io do assert @t.inline_source end assert_equal "RDoc::Task#inline_source is deprecated\n", err - _, err = capture_io do + _, err = verbose_capture_io do @t.inline_source = false end diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb index 47eb4de906..78d5fdec27 100644 --- a/test/rdoc/test_rdoc_text.rb +++ b/test/rdoc/test_rdoc_text.rb @@ -553,7 +553,7 @@ The comments associated with end def test_to_html_tt_tag_mismatch - _, err = capture_io do + _, err = verbose_capture_io do assert_equal 'hi', to_html('hi') end