From 0a4801e768cd93c79666f32460306f132009aa9d Mon Sep 17 00:00:00 2001 From: ktsj Date: Sat, 7 Sep 2013 04:34:27 +0000 Subject: * lib/find.rb (Find.find): respect the encodings of arguments. [ruby-dev:47530] [Feature #8657] * test/test_find.rb: add tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/test_find.rb | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'test') diff --git a/test/test_find.rb b/test/test_find.rb index f6e7f7a13d..b26debe547 100644 --- a/test/test_find.rb +++ b/test/test_find.rb @@ -210,6 +210,40 @@ class TestFind < Test::Unit::TestCase } end + def test_encoding_ascii + Dir.mktmpdir {|d| + File.open("#{d}/a", "w"){} + Dir.mkdir("#{d}/b") + a = [] + Find.find(d.encode(Encoding::US_ASCII)) {|f| a << f } + a.each do |i| + assert(Encoding.compatible?(d.encode(Encoding.find('filesystem')), i)) + end + } + end + + def test_encoding_non_ascii + Dir.mktmpdir {|d| + File.open("#{d}/a", "w"){} + Dir.mkdir("#{d}/b") + euc_jp = Encoding::EUC_JP + win_31j = Encoding::Windows_31J + utf_8 = Encoding::UTF_8 + a = [] + Find.find(d.encode(euc_jp), d.encode(win_31j), d.encode(utf_8)) {|f| a << [f, f.encoding] } + assert_equal([[d, euc_jp], ["#{d}/a", euc_jp], ["#{d}/b", euc_jp], + [d, win_31j], ["#{d}/a", win_31j], ["#{d}/b", win_31j], + [d, utf_8], ["#{d}/a", utf_8], ["#{d}/b", utf_8]], + a) + if /mswin|mingw/ =~ RUBY_PLATFORM + a = [] + Dir.mkdir("#{d}/\u{2660}") + Find.find("#{d}".encode(utf_8)) {|f| a << [f, f.encoding] } + assert_equal([[d, utf_8], ["#{d}/a", utf_8], ["#{d}/b", utf_8], ["#{d}/\u{2660}", utf_8]], a) + end + } + end + class TestInclude < Test::Unit::TestCase include Find -- cgit v1.2.3