ruby-changes:18804
From: usa <ko1@a...>
Date: Wed, 9 Feb 2011 09:49:10 +0900 (JST)
Subject: [ruby-changes:18804] Ruby:r30829 (trunk): * test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong)
usa 2011-02-09 09:47:42 +0900 (Wed, 09 Feb 2011) New Revision: 30829 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30829 Log: * test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong) platform-dependent hacks. Modified files: trunk/ChangeLog trunk/test/rdoc/test_rdoc_encoding.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 30828) +++ ChangeLog (revision 30829) @@ -1,3 +1,8 @@ +Wed Feb 9 09:45:43 2011 NAKAMURA Usaku <usa@r...> + + * test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong) + platform-dependent hacks. + Wed Feb 9 00:47:18 2011 Tanaka Akira <akr@f...> * ext/etc/etc.c: parenthesize macro arguments. Index: test/rdoc/test_rdoc_encoding.rb =================================================================== --- test/rdoc/test_rdoc_encoding.rb (revision 30828) +++ test/rdoc/test_rdoc_encoding.rb (revision 30829) @@ -26,9 +26,6 @@ @tempfile.write expected @tempfile.flush - # FIXME 1.9 fix on windoze - expected.gsub!("\n", "\r\n") if RUBY_VERSION =~ /^1.9/ && RUBY_PLATFORM =~ /mswin|mingw/ - contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8 assert_equal "hi everybody", contents assert_equal Encoding::UTF_8, contents.encoding @@ -55,9 +52,6 @@ @tempfile.write "# coding: utf-8\n\317\200" # pi @tempfile.flush - # FIXME 1.9 fix on windoze - expected.gsub!("\n", "\r\n") if RUBY_VERSION =~ /^1.9/ && RUBY_PLATFORM =~ /mswin|mingw/ - contents = :junk _, err = capture_io do @@ -78,9 +72,6 @@ @tempfile.write expected @tempfile.flush - # FIXME 1.9 fix on windoze - expected.gsub!("\n", "\r\n") if RUBY_VERSION =~ /^1.9/ && RUBY_PLATFORM =~ /win32|mingw32/ - contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8 assert_equal "hi everybody", contents assert_equal Encoding::UTF_8, contents.encoding @@ -92,9 +83,6 @@ @tempfile.write "# coding: utf-8\n\317\200" # pi @tempfile.flush - # FIXME 1.9 fix on windoze - expected.gsub!("\n", "\r\n") if RUBY_VERSION =~ /^1.9/ && RUBY_PLATFORM =~ /mswin|mingw/ - contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII, true assert_equal '?', contents -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/