ruby-changes:25921
From: naruse <ko1@a...>
Date: Thu, 29 Nov 2012 16:02:00 +0900 (JST)
Subject: [ruby-changes:25921] naruse:r37978 (trunk): * lib/rdoc/test_case.rb (RDoc::TestCase#verbose_capture_io):
naruse 2012-11-29 16:01:46 +0900 (Thu, 29 Nov 2012) New Revision: 37978 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37978 Log: * 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. Modified files: trunk/ChangeLog trunk/lib/rdoc/test_case.rb trunk/test/rdoc/test_rdoc_context.rb trunk/test/rdoc/test_rdoc_context_section.rb trunk/test/rdoc/test_rdoc_encoding.rb trunk/test/rdoc/test_rdoc_options.rb trunk/test/rdoc/test_rdoc_parser_c.rb trunk/test/rdoc/test_rdoc_rdoc.rb trunk/test/rdoc/test_rdoc_task.rb trunk/test/rdoc/test_rdoc_text.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 37977) +++ ChangeLog (revision 37978) @@ -1,3 +1,11 @@ +Thu Nov 29 15:56:14 2012 NARUSE, Yui <naruse@r...> + + * 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 <usa@r...> * ext/psych/extconf.rb: added --enable-bundled-libyaml option. this Index: lib/rdoc/test_case.rb =================================================================== --- lib/rdoc/test_case.rb (revision 37977) +++ lib/rdoc/test_case.rb (revision 37978) @@ -151,6 +151,20 @@ @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 Index: test/rdoc/test_rdoc_rdoc.rb =================================================================== --- test/rdoc/test_rdoc_rdoc.rb (revision 37977) +++ test/rdoc/test_rdoc_rdoc.rb (revision 37978) @@ -128,7 +128,7 @@ files = nil - out, err = capture_io do + out, err = verbose_capture_io do files = @rdoc.normalized_file_list %w[/dev/stdin] end Index: test/rdoc/test_rdoc_text.rb =================================================================== --- test/rdoc/test_rdoc_text.rb (revision 37977) +++ test/rdoc/test_rdoc_text.rb (revision 37978) @@ -553,7 +553,7 @@ end def test_to_html_tt_tag_mismatch - _, err = capture_io do + _, err = verbose_capture_io do assert_equal '<tt>hi', to_html('<tt>hi') end Index: test/rdoc/test_rdoc_options.rb =================================================================== --- test/rdoc/test_rdoc_options.rb (revision 37977) +++ test/rdoc/test_rdoc_options.rb (revision 37978) @@ -45,7 +45,7 @@ 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 @@ @options.verbosity = 2 - out, err = capture_io do + out, err = verbose_capture_io do @options.warn "warnings on" end Index: test/rdoc/test_rdoc_task.rb =================================================================== --- test/rdoc/test_rdoc_task.rb (revision 37977) +++ test/rdoc/test_rdoc_task.rb (revision 37978) @@ -16,13 +16,13 @@ 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 Index: test/rdoc/test_rdoc_context_section.rb =================================================================== --- test/rdoc/test_rdoc_context_section.rb (revision 37977) +++ test/rdoc/test_rdoc_context_section.rb (revision 37978) @@ -126,7 +126,7 @@ end def test_sequence - _, err = capture_io do + _, err = verbose_capture_io do assert_match(/\ASEC\d{5}\Z/, @s.sequence) end Index: test/rdoc/test_rdoc_context.rb =================================================================== --- test/rdoc/test_rdoc_context.rb (revision 37977) +++ test/rdoc/test_rdoc_context.rb (revision 37978) @@ -230,7 +230,7 @@ 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 Index: test/rdoc/test_rdoc_encoding.rb =================================================================== --- test/rdoc/test_rdoc_encoding.rb (revision 37977) +++ test/rdoc/test_rdoc_encoding.rb (revision 37978) @@ -53,7 +53,7 @@ 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 @@ @tempfile.flush contents = :junk - _, err = capture_io do + _, err = verbose_capture_io do contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8 end Index: test/rdoc/test_rdoc_parser_c.rb =================================================================== --- test/rdoc/test_rdoc_parser_c.rb (revision 37977) +++ test/rdoc/test_rdoc_parser_c.rb (revision 37978) @@ -244,7 +244,7 @@ } EOF - _, err = capture_io do + _, err = verbose_capture_io do refute util_get_class(content, 'cDate') end @@ -549,7 +549,7 @@ klass = nil - _, err = capture_io do + _, err = verbose_capture_io do klass = util_get_class content, 'cDate' end @@ -571,7 +571,7 @@ klass = nil - _, err = capture_io do + _, err = verbose_capture_io do klass = util_get_class content, 'cDate' end @@ -593,7 +593,7 @@ klass = nil - _, err = capture_io do + _, err = verbose_capture_io do klass = util_get_class content, 'cDate' end @@ -659,7 +659,7 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/