diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-14 00:10:58 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-14 00:10:58 +0000 |
| commit | d551b78d4ad27c1c9a4026d11896d4630a1ffed8 (patch) | |
| tree | bd3b991236ac3dd6a02bc567d62a8a07e1d337d2 /test/ruby/test_dir_m17n.rb | |
| parent | 38be07f833e143f43b1ff19836b14459a0132302 (diff) | |
| download | ruby-d551b78d4ad27c1c9a4026d11896d4630a1ffed8.tar.gz | |
test_dir_m17n.rb: fixed encoding file system on OS X
* test/ruby/test_dir_m17n.rb (test_filename_as_bytes_extutf8),
(test_filename_bytes_euc_jp, test_filename_euc_jp),
(test_filename_ext_euc_jp_and_int_utf_8): Mac OS X also has fixed
encoding file system.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_dir_m17n.rb')
| -rw-r--r-- | test/ruby/test_dir_m17n.rb | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb index ce70971816..a8fab3d216 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -87,7 +87,7 @@ class TestDir_M17N < Test::Unit::TestCase assert_include(ents, filename) EOS assert_separately(%w[-EUTF-8], <<-'EOS', :chdir=>d) - if /mswin|mingw/ =~ RUBY_PLATFORM + if /mswin|mingw|darwin/ =~ RUBY_PLATFORM filename = "\x8f\xa2\xc2".force_encoding("euc-jp") else filename = "\xc2\xa1".force_encoding("euc-jp") @@ -97,7 +97,7 @@ class TestDir_M17N < Test::Unit::TestCase end EOS # no meaning test on windows - unless /mswin|mingw/ =~ RUBY_PLATFORM + unless /mswin|mingw|darwin/ =~ RUBY_PLATFORM assert_separately(%W[-EUTF-8], <<-'EOS', :chdir=>d) filename1 = "\xc2\xa1".force_encoding("utf-8") filename2 = "\xc2\xa1".force_encoding("euc-jp") @@ -179,8 +179,8 @@ class TestDir_M17N < Test::Unit::TestCase opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM ents = Dir.entries(".", opts) ents.each {|e| e.force_encoding("ASCII-8BIT") } - if /darwin/ =~ RUBY_PLATFORM && ents.include?("%A4%A2".force_encoding("ASCII-8BIT")) - filename = "%A4%A2" + if /darwin/ =~ RUBY_PLATFORM + filename = filename.encode("utf-8") end assert_include(ents, filename.force_encoding("ASCII-8BIT")) EOS @@ -194,8 +194,8 @@ class TestDir_M17N < Test::Unit::TestCase File.open(filename, "w") {} opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM ents = Dir.entries(".", opts) - if /darwin/ =~ RUBY_PLATFORM && ents.include?(eucjp_filename = "%A4%A2".force_encoding("euc-jp")) - filename = eucjp_filename + if /darwin/ =~ RUBY_PLATFORM + filename = filename.encode("utf-8").force_encoding("euc-jp") end assert_include(ents, filename) EOS @@ -207,9 +207,7 @@ class TestDir_M17N < Test::Unit::TestCase unless ents.include?(filename) case RUBY_PLATFORM when /darwin/ - if ents.include?(asc_filename = "%A4%A2".force_encoding("ASCII-8BIT")) - filename = asc_filename - end + filename = filename.encode("utf-8", "euc-jp").b when /mswin|mingw/ if ents.include?(win_expected_filename.dup.force_encoding("ASCII-8BIT")) ents = Dir.entries(".", {:encoding => Encoding.find("filesystem")}) @@ -241,8 +239,8 @@ class TestDir_M17N < Test::Unit::TestCase File.open(filename, "w") {} opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM ents = Dir.entries(".", opts) - if /darwin/ =~ RUBY_PLATFORM && ents.include?(eucjp_filename = "%A4%A2".force_encoding("euc-jp")) - filename = eucjp_filename + if /darwin/ =~ RUBY_PLATFORM + filename = filename.encode("utf-8", "euc-jp").force_encoding("euc-jp") end assert_include(ents, filename) EOS @@ -250,8 +248,8 @@ class TestDir_M17N < Test::Unit::TestCase filename = "\u3042" opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM ents = Dir.entries(".", opts) - if /darwin/ =~ RUBY_PLATFORM && ents.include?("%A4%A2") - filename = "%A4%A2" + if /darwin/ =~ RUBY_PLATFORM + filename = filename.force_encoding("euc-jp") end assert_include(ents, filename) EOS |