1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/reline] Add test for reset_variables in Reline::Config

Browse Source 
(https://github.com/ruby/reline/pull/741)

* Fix reset variables

* Add assertion for reload

* Add helper method to get instance variable value of Reline::Config

https://github.com/ruby/reline/commit/386f619ff5
This commit is contained in:
Mari Imaizumi 2024-09-04 00:32:25 +09:00 committed by git
parent ad9d2c6435
commit 0889f64021
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/reline/config.rb
View File

@ -62,10 +62,11 @@ class Reline::Config
@keyseq_timeout = 500 @keyseq_timeout = 500
@test_mode = false @test_mode = false
@autocompletion = false @autocompletion = false
@convert_meta = true if seven_bit_encoding?(Reline::IOGate.encoding) @convert_meta = seven_bit_encoding?(Reline::IOGate.encoding)
@loaded = false @loaded = false
@enable_bracketed_paste = true @enable_bracketed_paste = true
@show_mode_in_prompt = false @show_mode_in_prompt = false
@default_inputrc_path = nil
end end
def editing_mode def editing_mode

40
test/reline/test_config.rb
View File

@ -24,8 +24,12 @@ class Reline::Config::Test < Reline::TestCase
ENV['INPUTRC'] = @inputrc_backup ENV['INPUTRC'] = @inputrc_backup
end end
def get_config_variable(variable)
@config.instance_variable_get(variable)
end
def additional_key_bindings(keymap_label) def additional_key_bindings(keymap_label)
@config.instance_variable_get(:@additional_key_bindings)[keymap_label].instance_variable_get(:@key_bindings) get_config_variable(:@additional_key_bindings)[keymap_label].instance_variable_get(:@key_bindings)
end end
def registered_key_bindings(keys) def registered_key_bindings(keys)
@ -38,7 +42,7 @@ class Reline::Config::Test < Reline::TestCase
set show-mode-in-prompt on set show-mode-in-prompt on
LINES LINES
assert_equal true, @config.instance_variable_get(:@show_mode_in_prompt) assert_equal true, get_config_variable(:@show_mode_in_prompt)
end end
def test_read_lines_with_variable def test_read_lines_with_variable
@ -46,7 +50,7 @@ class Reline::Config::Test < Reline::TestCase
set disable-completion on set disable-completion on
LINES LINES
assert_equal true, @config.instance_variable_get(:@disable_completion) assert_equal true, get_config_variable(:@disable_completion)
end end
def test_string_value def test_string_value
@ -55,7 +59,7 @@ class Reline::Config::Test < Reline::TestCase
set emacs-mode-string Emacs set emacs-mode-string Emacs
LINES LINES
assert_equal 'Emacs', @config.instance_variable_get(:@emacs_mode_string) assert_equal 'Emacs', get_config_variable(:@emacs_mode_string)
end end
def test_string_value_with_brackets def test_string_value_with_brackets
@ -64,7 +68,7 @@ class Reline::Config::Test < Reline::TestCase
set emacs-mode-string [Emacs] set emacs-mode-string [Emacs]
LINES LINES
assert_equal '[Emacs]', @config.instance_variable_get(:@emacs_mode_string) assert_equal '[Emacs]', get_config_variable(:@emacs_mode_string)
end end
def test_string_value_with_brackets_and_quotes def test_string_value_with_brackets_and_quotes
@ -73,7 +77,7 @@ class Reline::Config::Test < Reline::TestCase
set emacs-mode-string "[Emacs]" set emacs-mode-string "[Emacs]"
LINES LINES
assert_equal '[Emacs]', @config.instance_variable_get(:@emacs_mode_string) assert_equal '[Emacs]', get_config_variable(:@emacs_mode_string)
end end
def test_string_value_with_parens def test_string_value_with_parens
@ -82,7 +86,7 @@ class Reline::Config::Test < Reline::TestCase
set emacs-mode-string (Emacs) set emacs-mode-string (Emacs)
LINES LINES
assert_equal '(Emacs)', @config.instance_variable_get(:@emacs_mode_string) assert_equal '(Emacs)', get_config_variable(:@emacs_mode_string)
end end
def test_string_value_with_parens_and_quotes def test_string_value_with_parens_and_quotes
@ -91,7 +95,7 @@ class Reline::Config::Test < Reline::TestCase
set emacs-mode-string "(Emacs)" set emacs-mode-string "(Emacs)"
LINES LINES
assert_equal '(Emacs)', @config.instance_variable_get(:@emacs_mode_string) assert_equal '(Emacs)', get_config_variable(:@emacs_mode_string)
end end
def test_encoding_is_ascii def test_encoding_is_ascii
@ -105,7 +109,7 @@ class Reline::Config::Test < Reline::TestCase
def test_encoding_is_not_ascii def test_encoding_is_not_ascii
@config = Reline::Config.new @config = Reline::Config.new
assert_equal nil, @config.convert_meta assert_equal false, @config.convert_meta
end end
def test_invalid_keystroke def test_invalid_keystroke
@ -169,7 +173,7 @@ class Reline::Config::Test < Reline::TestCase
$include included_partial $include included_partial
LINES LINES
assert_equal true, @config.instance_variable_get(:@show_mode_in_prompt) assert_equal true, get_config_variable(:@show_mode_in_prompt)
end end
def test_include_expand_path def test_include_expand_path
@ -184,7 +188,7 @@ class Reline::Config::Test < Reline::TestCase
$include ~/included_partial $include ~/included_partial
LINES LINES
assert_equal true, @config.instance_variable_get(:@show_mode_in_prompt) assert_equal true, get_config_variable(:@show_mode_in_prompt)
ensure ensure
ENV['HOME'] = home_backup ENV['HOME'] = home_backup
end end
@ -198,7 +202,7 @@ class Reline::Config::Test < Reline::TestCase
$endif $endif
LINES LINES
assert_equal '(cmd)', @config.instance_variable_get(:@vi_cmd_mode_string) assert_equal '(cmd)', get_config_variable(:@vi_cmd_mode_string)
end end
def test_if_with_false def test_if_with_false
@ -210,7 +214,7 @@ class Reline::Config::Test < Reline::TestCase
$endif $endif
LINES LINES
assert_equal '[cmd]', @config.instance_variable_get(:@vi_cmd_mode_string) assert_equal '[cmd]', get_config_variable(:@vi_cmd_mode_string)
end end
def test_if_with_indent def test_if_with_indent
@ -224,7 +228,7 @@ class Reline::Config::Test < Reline::TestCase
$endif $endif
LINES LINES
assert_equal '(cmd)', @config.instance_variable_get(:@vi_cmd_mode_string) assert_equal '(cmd)', get_config_variable(:@vi_cmd_mode_string)
end end
end end
@ -446,7 +450,7 @@ class Reline::Config::Test < Reline::TestCase
set history-size 5000 set history-size 5000
LINES LINES
assert_equal 5000, @config.instance_variable_get(:@history_size) assert_equal 5000, get_config_variable(:@history_size)
history = Reline::History.new(@config) history = Reline::History.new(@config)
history << "a\n" history << "a\n"
assert_equal 1, history.size assert_equal 1, history.size
@ -477,7 +481,7 @@ class Reline::Config::Test < Reline::TestCase
set vi-ins-mode-string aaa aaa set vi-ins-mode-string aaa aaa
set vi-cmd-mode-string bbb ccc # comment set vi-cmd-mode-string bbb ccc # comment
LINES LINES
assert_equal :vi_insert, @config.instance_variable_get(:@editing_mode_label) assert_equal :vi_insert, get_config_variable(:@editing_mode_label)
assert_equal 'aaa aaa', @config.vi_ins_mode_string assert_equal 'aaa aaa', @config.vi_ins_mode_string
assert_equal 'bbb ccc # comment', @config.vi_cmd_mode_string assert_equal 'bbb ccc # comment', @config.vi_cmd_mode_string
end end
@ -576,5 +580,9 @@ class Reline::Config::Test < Reline::TestCase
File.write(inputrc, "set emacs-mode-string ?") File.write(inputrc, "set emacs-mode-string ?")
@config.reload @config.reload
assert_equal '?', @config.emacs_mode_string assert_equal '?', @config.emacs_mode_string
File.write(inputrc, "")
@config.reload
assert_equal '@', @config.emacs_mode_string
end end
end end