kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

tests refined.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-11-15 17:11:54 +00:00
parent 9ea0bed1a3
commit 453890a972
3 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -7,8 +7,8 @@ Mon Nov 16 01:35:34 2009 Tanaka Akira <akr@fsij.org>
* encoding.c (rb_filesystem_encindex): use default external encoding
instead of locale encoding in Unix.
* ruby.c (process_options): delay inifilesystem encoding
initialization after default external encoding initialization.
* ruby.c (process_options): delay filesystem encoding
initialization until default external encoding initialization.
Mon Nov 16 00:06:26 2009 Yusuke Endoh <mame@tsg.ne.jp>

17
test/ruby/envutil.rb
View file

@ -127,7 +127,8 @@ module Test
end
LANG_ENVS = %w"LANG LC_ALL LC_CTYPE"
def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil, opt={})
def invoke_ruby_assertion(args, test_stdin="", test_stdout=nil, test_stderr=nil, test_status=true, message = nil, opt={})
in_c, in_p = IO.pipe
out_p, out_c = IO.pipe if test_stdout
err_p, err_c = IO.pipe if test_stderr
@ -155,6 +156,7 @@ module Test
out_p.close if test_stdout
err_p.close if test_stderr
Process.wait pid
status = $?
if block_given?
yield(test_stdout ? stdout.lines.map {|l| l.chomp } : nil, test_stderr ? stderr.lines.map {|l| l.chomp } : nil)
else
@ -173,6 +175,10 @@ module Test
end
end
end
if test_status
assert(status.success?, "ruby exit stauts is not success: #{status.inspect}")
end
status
ensure
env.each_pair {|lc, v|
if v
@ -191,9 +197,14 @@ module Test
(th_stderr.kill; th_stderr.join) if th_stderr
end
def assert_in_out(args, test_stdin = "", test_stdout = [], message = nil, opt={})
assert_in_out_err(args, test_stdin, test_stdout, nil, message, opt)
def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil, opt={})
invoke_ruby_assertion(args, test_stdin, test_stdout, test_stderr, false, message, opt)
end
def assert_ruby_status(args, test_stdin = "", message = nil, opt={})
invoke_ruby_assertion(args, test_stdin, nil, nil, true, message, opt)
end
end
end
end

28
test/ruby/test_dir_m17n.rb
View file

@ -13,34 +13,50 @@ class TestDir_M17N < Test::Unit::TestCase
def test_filename_bytes_euc_jp
with_tmpdir {|d|
assert_in_out(%w[-EEUC-JP], <<-'EOS', %w[true], nil, :chdir=>d)
assert_ruby_status(%w[-EEUC-JP], <<-'EOS', nil, :chdir=>d)
filename = "\xA4\xA2".force_encoding("euc-jp")
File.open(filename, "w") {}
ents = Dir.entries(".")
ents.each {|e| e.force_encoding("ASCII-8BIT") }
p ents.include?(filename.force_encoding("ASCII-8BIT"))
exit ents.include?(filename.force_encoding("ASCII-8BIT"))
EOS
}
end
def test_filename_euc_jp
with_tmpdir {|d|
assert_in_out(%w[-EEUC-JP], <<-'EOS', %w[true], nil, :chdir=>d)
assert_ruby_status(%w[-EEUC-JP], <<-'EOS', nil, :chdir=>d)
filename = "\xA4\xA2".force_encoding("euc-jp")
File.open(filename, "w") {}
ents = Dir.entries(".")
p ents.include?(filename)
exit ents.include?(filename)
EOS
}
end
def test_filename_utf_8
with_tmpdir {|d|
assert_in_out(%w[-EUTF-8], <<-'EOS', %w[true], nil, :chdir=>d)
assert_ruby_status(%w[-EUTF-8], <<-'EOS', nil, :chdir=>d)
filename = "\u3042".force_encoding("utf-8")
File.open(filename, "w") {}
ents = Dir.entries(".")
p ents.include?(filename)
exit ents.include?(filename)
EOS
}
end
def test_filename_ext_euc_jp_and_int_utf_8
with_tmpdir {|d|
assert_ruby_status(%w[-EEUC-JP], <<-'EOS', nil, :chdir=>d)
filename = "\xA4\xA2".force_encoding("euc-jp")
File.open(filename, "w") {}
ents = Dir.entries(".")
exit ents.include?(filename)
EOS
assert_ruby_status(%w[-EEUC-JP:UTF-8], <<-'EOS', nil, :chdir=>d)
filename = "\u3042".force_encoding("utf-8")
ents = Dir.entries(".")
exit ents.include?(filename)
EOS
}
end