mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong)
platform-dependent hacks. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									cf67952602
								
							
						
					
					
						commit
						acda9a6872
					
				
					 2 changed files with 5 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -1,3 +1,8 @@
 | 
			
		|||
Wed Feb  9 09:45:43 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
 | 
			
		||||
 | 
			
		||||
	* test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong)
 | 
			
		||||
	  platform-dependent hacks.
 | 
			
		||||
 | 
			
		||||
Wed Feb  9 00:47:18 2011  Tanaka Akira  <akr@fsij.org>
 | 
			
		||||
 | 
			
		||||
	* ext/etc/etc.c: parenthesize macro arguments.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,9 +26,6 @@ class TestRDocEncoding < MiniTest::Unit::TestCase
 | 
			
		|||
    @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 @@ class TestRDocEncoding < MiniTest::Unit::TestCase
 | 
			
		|||
    @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 @@ class TestRDocEncoding < MiniTest::Unit::TestCase
 | 
			
		|||
    @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 @@ class TestRDocEncoding < MiniTest::Unit::TestCase
 | 
			
		|||
    @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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue