From b025a5cb720c2eb552b852577f5a9351ef7b5ae8 Mon Sep 17 00:00:00 2001 From: Stan Lo Date: Wed, 5 Jul 2023 18:17:30 +0100 Subject: [PATCH 1/2] Reference to Reline.core directly --- test/reline/helper.rb | 4 ++-- test/reline/test_reline.rb | 4 ++-- test/reline/test_within_pipe.rb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/reline/helper.rb b/test/reline/helper.rb index b8751ff16e..bb23893187 100644 --- a/test/reline/helper.rb +++ b/test/reline/helper.rb @@ -29,8 +29,8 @@ def test_mode(ansi: false) encoding = Encoding::UTF_8 end Reline::GeneralIO.reset(encoding: encoding) unless ansi - send(:core).config.instance_variable_set(:@test_mode, true) - send(:core).config.reset + core.config.instance_variable_set(:@test_mode, true) + core.config.reset end def test_reset diff --git a/test/reline/test_reline.rb b/test/reline/test_reline.rb index 460fb7872d..9b84dbc8e8 100644 --- a/test/reline/test_reline.rb +++ b/test/reline/test_reline.rb @@ -302,12 +302,12 @@ def test_set_input_and_output def test_vi_editing_mode Reline.vi_editing_mode - assert_equal(Reline::KeyActor::ViInsert, Reline.send(:core).config.editing_mode.class) + assert_equal(Reline::KeyActor::ViInsert, Reline.core.config.editing_mode.class) end def test_emacs_editing_mode Reline.emacs_editing_mode - assert_equal(Reline::KeyActor::Emacs, Reline.send(:core).config.editing_mode.class) + assert_equal(Reline::KeyActor::Emacs, Reline.core.config.editing_mode.class) end def test_add_dialog_proc diff --git a/test/reline/test_within_pipe.rb b/test/reline/test_within_pipe.rb index 930f99c32d..a42ca755fc 100644 --- a/test/reline/test_within_pipe.rb +++ b/test/reline/test_within_pipe.rb @@ -3,14 +3,14 @@ class Reline::WithinPipeTest < Reline::TestCase def setup Reline.send(:test_mode) - @encoding = Reline::IOGate.encoding + @encoding = Reline.core.encoding @input_reader, @writer = IO.pipe(@encoding) Reline.input = @input_reader @reader, @output_writer = IO.pipe(@encoding) @output = Reline.output = @output_writer - @config = Reline.send(:core).config + @config = Reline.core.config @config.keyseq_timeout *= 600 if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # for --jit-wait CI - @line_editor = Reline.send(:core).line_editor + @line_editor = Reline.core.line_editor end def teardown From fb0933ad4cca342de435c2172e9b463888dd1e6b Mon Sep 17 00:00:00 2001 From: Stan Lo Date: Wed, 5 Jul 2023 18:19:47 +0100 Subject: [PATCH 2/2] Replace Reline::IOGate.encoding with Reline.core.encoding --- test/reline/test_history.rb | 2 +- test/reline/test_key_actor_emacs.rb | 6 +++--- test/reline/test_key_actor_vi.rb | 2 +- test/reline/test_macro.rb | 2 +- test/reline/test_reline.rb | 2 +- test/reline/test_string_processing.rb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/reline/test_history.rb b/test/reline/test_history.rb index 53360409bc..ddf8fb1472 100644 --- a/test/reline/test_history.rb +++ b/test/reline/test_history.rb @@ -297,7 +297,7 @@ def assert_external_string_equal(expected, actual) end def get_default_internal_encoding - if encoding = Reline::IOGate.encoding + if encoding = Reline.core.encoding encoding elsif RUBY_PLATFORM =~ /mswin|mingw/ Encoding.default_internal || Encoding::UTF_8 diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb index 18a2448539..4575e51eb2 100644 --- a/test/reline/test_key_actor_emacs.rb +++ b/test/reline/test_key_actor_emacs.rb @@ -8,7 +8,7 @@ def setup @config.autocompletion = false Reline::HISTORY.instance_variable_set(:@config, @config) Reline::HISTORY.clear - @encoding = Reline::IOGate.encoding + @encoding = Reline.core.encoding @line_editor = Reline::LineEditor.new(@config, @encoding) @line_editor.reset(@prompt, encoding: @encoding) end @@ -2167,7 +2167,7 @@ def test_ed_search_next_history_with_empty # Unicode emoji test def test_ed_insert_for_include_zwj_emoji - omit "This test is for UTF-8 but the locale is #{Reline::IOGate.encoding}" if Reline::IOGate.encoding != Encoding::UTF_8 + omit "This test is for UTF-8 but the locale is #{Reline.core.encoding}" if Reline.core.encoding != Encoding::UTF_8 # U+1F468 U+200D U+1F469 U+200D U+1F467 U+200D U+1F466 is family: man, woman, girl, boy "๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ" input_keys("\u{1F468}") # U+1F468 is man "๐Ÿ‘จ" assert_line("\u{1F468}") @@ -2213,7 +2213,7 @@ def test_ed_insert_for_include_zwj_emoji end def test_ed_insert_for_include_valiation_selector - omit "This test is for UTF-8 but the locale is #{Reline::IOGate.encoding}" if Reline::IOGate.encoding != Encoding::UTF_8 + omit "This test is for UTF-8 but the locale is #{Reline.core.encoding}" if Reline.core.encoding != Encoding::UTF_8 # U+0030 U+FE00 is DIGIT ZERO + VARIATION SELECTOR-1 "0๏ธ€" input_keys("\u0030") # U+0030 is DIGIT ZERO assert_line("\u0030") diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb index 6e1d9dbbda..20630e5809 100644 --- a/test/reline/test_key_actor_vi.rb +++ b/test/reline/test_key_actor_vi.rb @@ -8,7 +8,7 @@ def setup @config.read_lines(<<~LINES.split(/(?<=\n)/)) set editing-mode vi LINES - @encoding = Reline::IOGate.encoding + @encoding = Reline.core.encoding @line_editor = Reline::LineEditor.new(@config, @encoding) @line_editor.reset(@prompt, encoding: @encoding) end diff --git a/test/reline/test_macro.rb b/test/reline/test_macro.rb index 76a677c834..3096930830 100644 --- a/test/reline/test_macro.rb +++ b/test/reline/test_macro.rb @@ -4,7 +4,7 @@ class Reline::MacroTest < Reline::TestCase def setup Reline.send(:test_mode) @config = Reline::Config.new - @encoding = Reline::IOGate.encoding + @encoding = Reline.core.encoding @line_editor = Reline::LineEditor.new(@config, @encoding) @line_editor.instance_variable_set(:@screen_size, [24, 80]) @output = @line_editor.output = File.open(IO::NULL, "w") diff --git a/test/reline/test_reline.rb b/test/reline/test_reline.rb index 9b84dbc8e8..22ac36e4a9 100644 --- a/test/reline/test_reline.rb +++ b/test/reline/test_reline.rb @@ -378,7 +378,7 @@ def test_dumb_terminal end def get_reline_encoding - if encoding = Reline::IOGate.encoding + if encoding = Reline.core.encoding encoding elsif RUBY_PLATFORM =~ /mswin|mingw/ Encoding::UTF_8 diff --git a/test/reline/test_string_processing.rb b/test/reline/test_string_processing.rb index 5db97545da..2e5d27dc4f 100644 --- a/test/reline/test_string_processing.rb +++ b/test/reline/test_string_processing.rb @@ -6,7 +6,7 @@ def setup @prompt = '> ' @config = Reline::Config.new Reline::HISTORY.instance_variable_set(:@config, @config) - @encoding = Reline::IOGate.encoding + @encoding = Reline.core.encoding @line_editor = Reline::LineEditor.new(@config, @encoding) @line_editor.reset(@prompt, encoding: @encoding) end