mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
1f828497d1
when $SAFE is set to 4. $SAFE=4 is now obsolete. [ruby-core:55222] [Feature #8468] * object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust): Kernel#untrusted?, untrust, and trust are now deprecated. Their behavior is same as tainted?, taint, and untaint, respectively. * include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED() and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(), respectively. * array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c, ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c, ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c, ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c, ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c, ext/socket/socket.c, ext/socket/udpsocket.c, ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c, ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c, load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c, safe.c, string.c, thread.c, transcode.c, variable.c, vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for $SAFE=4. * test/dl/test_dl2.rb, test/erb/test_erb.rb, test/readline/test_readline.rb, test/readline/test_readline_history.rb, test/ruby/test_alias.rb, test/ruby/test_array.rb, test/ruby/test_dir.rb, test/ruby/test_encoding.rb, test/ruby/test_env.rb, test/ruby/test_eval.rb, test/ruby/test_exception.rb, test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb, test/ruby/test_io.rb, test/ruby/test_method.rb, test/ruby/test_module.rb, test/ruby/test_object.rb, test/ruby/test_pack.rb, test/ruby/test_rand.rb, test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb, test/ruby/test_struct.rb, test/ruby/test_thread.rb, test/ruby/test_time.rb: remove tests for $SAFE=4. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
458 lines
13 KiB
Ruby
458 lines
13 KiB
Ruby
begin
|
|
require "readline"
|
|
rescue LoadError
|
|
else
|
|
require "test/unit"
|
|
require "tempfile"
|
|
end
|
|
|
|
class TestReadline < Test::Unit::TestCase
|
|
INPUTRC = "INPUTRC"
|
|
|
|
def setup
|
|
@inputrc, ENV[INPUTRC] = ENV[INPUTRC], IO::NULL
|
|
end
|
|
|
|
def teardown
|
|
ENV[INPUTRC] = @inputrc
|
|
Readline.instance_variable_set("@completion_proc", nil)
|
|
end
|
|
|
|
if !/EditLine/n.match(Readline::VERSION)
|
|
def test_readline
|
|
with_temp_stdio do |stdin, stdout|
|
|
stdin.write("hello\n")
|
|
stdin.close
|
|
stdout.flush
|
|
line = replace_stdio(stdin.path, stdout.path) {
|
|
Readline.readline("> ", true)
|
|
}
|
|
assert_equal("hello", line)
|
|
assert_equal(true, line.tainted?)
|
|
stdout.rewind
|
|
assert_equal("> ", stdout.read(2))
|
|
assert_equal(1, Readline::HISTORY.length)
|
|
assert_equal("hello", Readline::HISTORY[0])
|
|
assert_raise(SecurityError) do
|
|
Thread.start {
|
|
$SAFE = 1
|
|
replace_stdio(stdin.path, stdout.path) do
|
|
Readline.readline("> ".taint)
|
|
end
|
|
}.join
|
|
end
|
|
end
|
|
end
|
|
|
|
# line_buffer
|
|
# point
|
|
def test_line_buffer__point
|
|
begin
|
|
Readline.line_buffer
|
|
Readline.point
|
|
rescue NotImplementedError
|
|
return
|
|
end
|
|
|
|
with_temp_stdio do |stdin, stdout|
|
|
actual_text = nil
|
|
actual_line_buffer = nil
|
|
actual_point = nil
|
|
Readline.completion_proc = ->(text) {
|
|
actual_text = text
|
|
actual_point = Readline.point
|
|
actual_line_buffer = Readline.line_buffer
|
|
stdin.write(" finish\n")
|
|
stdin.flush
|
|
stdout.flush
|
|
return ["complete"]
|
|
}
|
|
|
|
stdin.write("first second\t")
|
|
stdin.flush
|
|
Readline.completion_append_character = " "
|
|
line = replace_stdio(stdin.path, stdout.path) {
|
|
Readline.readline("> ", false)
|
|
}
|
|
assert_equal("second", actual_text)
|
|
assert_equal("first second", actual_line_buffer)
|
|
assert_equal(12, actual_point)
|
|
assert_equal("first complete finish", Readline.line_buffer)
|
|
assert_equal(Encoding.find("locale"), Readline.line_buffer.encoding)
|
|
assert_equal(true, Readline.line_buffer.tainted?)
|
|
assert_equal(22, Readline.point)
|
|
|
|
stdin.rewind
|
|
stdout.rewind
|
|
|
|
stdin.write("first second\t")
|
|
stdin.flush
|
|
Readline.completion_append_character = nil
|
|
line = replace_stdio(stdin.path, stdout.path) {
|
|
Readline.readline("> ", false)
|
|
}
|
|
assert_equal("second", actual_text)
|
|
assert_equal("first second", actual_line_buffer)
|
|
assert_equal(12, actual_point)
|
|
assert_equal("first complete finish", Readline.line_buffer)
|
|
assert_equal(Encoding.find("locale"), Readline.line_buffer.encoding)
|
|
assert_equal(true, Readline.line_buffer.tainted?)
|
|
assert_equal(21, Readline.point)
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_input=
|
|
assert_raise(TypeError) do
|
|
Readline.input = "This is not a file."
|
|
end
|
|
end
|
|
|
|
def test_output=
|
|
assert_raise(TypeError) do
|
|
Readline.output = "This is not a file."
|
|
end
|
|
end
|
|
|
|
def test_completion_proc
|
|
expected = proc { |input| input }
|
|
Readline.completion_proc = expected
|
|
assert_equal(expected, Readline.completion_proc)
|
|
|
|
assert_raise(ArgumentError) do
|
|
Readline.completion_proc = "This does not have call method."
|
|
end
|
|
end
|
|
|
|
def test_completion_case_fold
|
|
expected = [true, false, "string", {"a" => "b"}]
|
|
expected.each do |e|
|
|
Readline.completion_case_fold = e
|
|
assert_equal(e, Readline.completion_case_fold)
|
|
end
|
|
end
|
|
|
|
def test_completion_proc_empty_result
|
|
with_temp_stdio do |stdin, stdout|
|
|
stdin.write("first\t")
|
|
stdin.flush
|
|
Readline.completion_proc = ->(text) {[]}
|
|
line1 = line2 = nil
|
|
replace_stdio(stdin.path, stdout.path) {
|
|
assert_nothing_raised(NoMemoryError) {line1 = Readline.readline("> ")}
|
|
stdin.write("\n")
|
|
stdin.flush
|
|
assert_nothing_raised(NoMemoryError) {line2 = Readline.readline("> ")}
|
|
}
|
|
assert_equal("first", line1)
|
|
assert_equal("", line2)
|
|
begin
|
|
assert_equal("", Readline.line_buffer)
|
|
rescue NotimplementedError
|
|
end
|
|
end
|
|
end if !/EditLine/n.match(Readline::VERSION)
|
|
|
|
def test_get_screen_size
|
|
begin
|
|
res = Readline.get_screen_size
|
|
assert(res.is_a?(Array))
|
|
rows, columns = *res
|
|
assert(rows.is_a?(Integer))
|
|
assert(rows >= 0)
|
|
assert(columns.is_a?(Integer))
|
|
assert(columns >= 0)
|
|
rescue NotImplementedError
|
|
end
|
|
end
|
|
|
|
# vi_editing_mode
|
|
# emacs_editing_mode
|
|
def test_editing_mode
|
|
begin
|
|
assert_equal(false, Readline.vi_editing_mode?)
|
|
assert_equal(true, Readline.emacs_editing_mode?)
|
|
|
|
assert_equal(nil, Readline.vi_editing_mode)
|
|
assert_equal(true, Readline.vi_editing_mode?)
|
|
assert_equal(false, Readline.emacs_editing_mode?)
|
|
assert_equal(nil, Readline.vi_editing_mode)
|
|
assert_equal(true, Readline.vi_editing_mode?)
|
|
assert_equal(false, Readline.emacs_editing_mode?)
|
|
|
|
assert_equal(nil, Readline.emacs_editing_mode)
|
|
assert_equal(false, Readline.vi_editing_mode?)
|
|
assert_equal(true, Readline.emacs_editing_mode?)
|
|
assert_equal(nil, Readline.emacs_editing_mode)
|
|
assert_equal(false, Readline.vi_editing_mode?)
|
|
assert_equal(true, Readline.emacs_editing_mode?)
|
|
rescue NotImplementedError
|
|
end
|
|
end
|
|
|
|
def test_completion_append_character
|
|
begin
|
|
enc = get_default_internal_encoding
|
|
data_expected = [
|
|
["x", "x"],
|
|
["xyx", "x"],
|
|
[" ", " "],
|
|
["\t", "\t"],
|
|
]
|
|
data_expected.each do |(data, expected)|
|
|
Readline.completion_append_character = data
|
|
assert_equal(expected, Readline.completion_append_character)
|
|
assert_equal(enc, Readline.completion_append_character.encoding)
|
|
end
|
|
Readline.completion_append_character = ""
|
|
assert_equal(nil, Readline.completion_append_character)
|
|
rescue NotImplementedError
|
|
end
|
|
end
|
|
|
|
def test_completion_encoding
|
|
bug5941 = '[Bug #5941]'
|
|
append_character = Readline.completion_append_character
|
|
Readline.completion_append_character = ""
|
|
completion_case_fold = Readline.completion_case_fold
|
|
locale = Encoding.find("locale")
|
|
if locale == Encoding::UTF_8
|
|
enc1 = Encoding::EUC_JP
|
|
else
|
|
enc1 = Encoding::UTF_8
|
|
end
|
|
results = nil
|
|
Readline.completion_proc = ->(text) {results}
|
|
|
|
[%W"\u{3042 3042} \u{3042 3044}", %W"\u{fe5b fe5b} \u{fe5b fe5c}"].any? do |w|
|
|
begin
|
|
results = w.map {|s| s.encode(locale)}
|
|
rescue Encoding::UndefinedConversionError
|
|
end
|
|
end or
|
|
begin
|
|
"\xa1\xa2".encode(Encoding::UTF_8, locale)
|
|
rescue
|
|
else
|
|
results = %W"\xa1\xa1 \xa1\xa2".map {|s| s.force_encoding(locale)}
|
|
end or
|
|
begin
|
|
return if assert_under_utf8
|
|
skip("missing test for locale #{locale.name}")
|
|
end
|
|
expected = results[0][0...1]
|
|
Readline.completion_case_fold = false
|
|
assert_equal(expected, with_pipe {|r, w| w << "\t"}, bug5941)
|
|
Readline.completion_case_fold = true
|
|
assert_equal(expected, with_pipe {|r, w| w << "\t"}, bug5941)
|
|
results.map! {|s| s.encode(enc1)}
|
|
assert_raise(Encoding::CompatibilityError, bug5941) do
|
|
with_pipe {|r, w| w << "\t"}
|
|
end
|
|
ensure
|
|
Readline.completion_case_fold = completion_case_fold
|
|
Readline.completion_append_character = append_character
|
|
end if !/EditLine/n.match(Readline::VERSION)
|
|
|
|
# basic_word_break_characters
|
|
# completer_word_break_characters
|
|
# basic_quote_characters
|
|
# completer_quote_characters
|
|
# filename_quote_characters
|
|
# special_prefixes
|
|
def test_some_characters_methods
|
|
method_names = [
|
|
"basic_word_break_characters",
|
|
"completer_word_break_characters",
|
|
"basic_quote_characters",
|
|
"completer_quote_characters",
|
|
"filename_quote_characters",
|
|
"special_prefixes",
|
|
]
|
|
method_names.each do |method_name|
|
|
begin
|
|
begin
|
|
enc = get_default_internal_encoding
|
|
saved = Readline.send(method_name.to_sym)
|
|
expecteds = [" ", " .,|\t", ""]
|
|
expecteds.each do |e|
|
|
Readline.send((method_name + "=").to_sym, e)
|
|
res = Readline.send(method_name.to_sym)
|
|
assert_equal(e, res)
|
|
assert_equal(enc, res.encoding)
|
|
end
|
|
ensure
|
|
Readline.send((method_name + "=").to_sym, saved) if saved
|
|
end
|
|
rescue NotImplementedError
|
|
end
|
|
end
|
|
end
|
|
|
|
def test_closed_outstream
|
|
bug5803 = '[ruby-dev:45043]'
|
|
IO.pipe do |r, w|
|
|
Readline.input = r
|
|
Readline.output = w
|
|
(w << "##\t").close
|
|
assert_raise(IOError, bug5803) {Readline.readline}
|
|
end
|
|
end
|
|
|
|
def test_pre_input_hook
|
|
begin
|
|
pr = proc {}
|
|
Readline.pre_input_hook = pr
|
|
assert_equal(pr, Readline.pre_input_hook)
|
|
Readline.pre_input_hook = nil
|
|
assert_nil(Readline.pre_input_hook)
|
|
rescue NotImplementedError
|
|
end
|
|
end
|
|
|
|
def test_insert_text
|
|
begin
|
|
str = "test_insert_text"
|
|
assert_equal(Readline, Readline.insert_text(str))
|
|
assert_equal(str, Readline.line_buffer)
|
|
assert_equal(get_default_internal_encoding,
|
|
Readline.line_buffer.encoding)
|
|
rescue NotImplementedError
|
|
end
|
|
end if !/EditLine/n.match(Readline::VERSION)
|
|
|
|
def test_modify_text_in_pre_input_hook
|
|
with_temp_stdio {|stdin, stdout|
|
|
begin
|
|
stdin.write("world\n")
|
|
stdin.close
|
|
Readline.pre_input_hook = proc do
|
|
assert_equal("", Readline.line_buffer)
|
|
Readline.insert_text("hello ")
|
|
Readline.redisplay
|
|
end
|
|
replace_stdio(stdin.path, stdout.path) do
|
|
line = Readline.readline("> ")
|
|
assert_equal("hello world", line)
|
|
end
|
|
assert_equal("> hello world\n", stdout.read)
|
|
stdout.close
|
|
rescue NotImplementedError
|
|
ensure
|
|
begin
|
|
Readline.pre_input_hook = nil
|
|
rescue NotImplementedError
|
|
end
|
|
end
|
|
}
|
|
end if !/EditLine|\A4\.3\z/n.match(Readline::VERSION)
|
|
|
|
def test_input_metachar
|
|
bug6601 = '[ruby-core:45682]'
|
|
Readline::HISTORY << "hello"
|
|
wo = nil
|
|
line = with_pipe do |r, w|
|
|
wo = w.dup
|
|
wo.write("\C-re\ef\n")
|
|
end
|
|
assert_equal("hello", line, bug6601)
|
|
ensure
|
|
wo.close
|
|
with_pipe {|r, w| w.write("\C-a\C-k\n")} # clear line_buffer
|
|
Readline::HISTORY.clear
|
|
end if !/EditLine/n.match(Readline::VERSION)
|
|
|
|
def test_input_metachar_multibyte
|
|
unless Encoding.find("locale") == Encoding::UTF_8
|
|
return if assert_under_utf8
|
|
skip 'this test needs UTF-8 locale'
|
|
end
|
|
bug6602 = '[ruby-core:45683]'
|
|
Readline::HISTORY << "\u3042\u3093"
|
|
Readline::HISTORY << "\u3044\u3093"
|
|
Readline::HISTORY << "\u3046\u3093"
|
|
open(IO::NULL, 'w') do |null|
|
|
IO.pipe do |r, w|
|
|
Readline.input = r
|
|
Readline.output = null
|
|
w << "\cr\u3093\n\n"
|
|
w << "\cr\u3042\u3093"
|
|
w.reopen(IO::NULL)
|
|
assert_equal("\u3046\u3093", Readline.readline("", true), bug6602)
|
|
assert_equal("\u3042\u3093", Readline.readline("", true), bug6602)
|
|
assert_equal(nil, Readline.readline("", true), bug6602)
|
|
end
|
|
end
|
|
ensure
|
|
with_pipe {|r, w| w.write("\C-a\C-k\n")} # clear line_buffer
|
|
Readline::HISTORY.clear
|
|
end if !/EditLine/n.match(Readline::VERSION)
|
|
|
|
private
|
|
|
|
def replace_stdio(stdin_path, stdout_path)
|
|
open(stdin_path, "r"){|stdin|
|
|
open(stdout_path, "w"){|stdout|
|
|
orig_stdin = STDIN.dup
|
|
orig_stdout = STDOUT.dup
|
|
orig_stderr = STDERR.dup
|
|
STDIN.reopen(stdin)
|
|
STDOUT.reopen(stdout)
|
|
STDERR.reopen(stdout)
|
|
begin
|
|
Readline.input = STDIN
|
|
Readline.output = STDOUT
|
|
yield
|
|
ensure
|
|
STDERR.reopen(orig_stderr)
|
|
STDIN.reopen(orig_stdin)
|
|
STDOUT.reopen(orig_stdout)
|
|
orig_stdin.close
|
|
orig_stdout.close
|
|
end
|
|
}
|
|
}
|
|
end
|
|
|
|
def with_temp_stdio
|
|
Tempfile.create("test_readline_stdin") {|stdin|
|
|
Tempfile.create("test_readline_stdout") {|stdout|
|
|
yield stdin, stdout
|
|
}
|
|
}
|
|
end
|
|
|
|
def with_pipe
|
|
stderr = nil
|
|
IO.pipe do |r, w|
|
|
yield(r, w)
|
|
Readline.input = r
|
|
Readline.output = w.reopen(IO::NULL)
|
|
stderr = STDERR.dup
|
|
STDERR.reopen(w)
|
|
Readline.readline
|
|
end
|
|
ensure
|
|
if stderr
|
|
STDERR.reopen(stderr)
|
|
stderr.close
|
|
end
|
|
Readline.input = STDIN
|
|
Readline.output = STDOUT
|
|
end
|
|
|
|
def get_default_internal_encoding
|
|
return Encoding.default_internal || Encoding.find("locale")
|
|
end
|
|
|
|
def assert_under_utf8
|
|
return false if ENV['LC_ALL'] == 'UTF-8'
|
|
loc = caller_locations(1, 1)[0].base_label.to_s
|
|
require_relative "../ruby/envutil"
|
|
assert_separately([{"LC_ALL"=>"UTF-8"}, "-r", __FILE__], <<SRC)
|
|
#skip "test \#{ENV['LC_ALL']}"
|
|
#{self.class.name}.new(#{loc.dump}).run(Test::Unit::Runner.new)
|
|
SRC
|
|
return true
|
|
end
|
|
end if defined?(::Readline)
|