Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Reline tests #24

Closed
wants to merge 1 commit into from
Closed

Remove Reline tests #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
- name: Install dependencies
run: |
bundle install
gem install reline --pre
- name: Run test
run: rake compile test
- name: Run test with libedit enabled
Expand Down
19 changes: 0 additions & 19 deletions test/readline/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,3 @@ def use_ext_readline # Use ext/readline as Readline
Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline)
Object.const_set(:Readline, ReadlineSo)
end

begin
require "reline"
rescue LoadError
Object.class_eval {remove_const :Reline} if defined?(Reline)
else
def use_lib_reline # Use lib/reline as Readline
Reline.send(:remove_const, 'IOGate') if Reline.const_defined?('IOGate')
Reline.const_set('IOGate', Reline::GeneralIO)
Reline.send(:core).config.instance_variable_set(:@test_mode, true)
Reline.send(:core).config.reset
Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline)
Object.const_set(:Readline, Reline)
end

def finish_using_lib_reline
Reline.instance_variable_set(:@core, nil)
end
end
28 changes: 1 addition & 27 deletions test/readline/test_readline.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,6 @@ def test_interrupt_in_other_thread

if defined?(TestReadline) && self.class == TestReadline
use = "use_ext_readline"
elsif defined?(TestRelineAsReadline) && self.class == TestRelineAsReadline
use = "use_lib_reline"
end
code = <<-"end;"
$stdout.sync = true
Expand Down Expand Up @@ -825,8 +823,6 @@ def test_without_tty
loader = nil
if defined?(TestReadline) && self.class == TestReadline
loader = "use_ext_readline"
elsif defined?(TestRelineAsReadline) && self.class == TestRelineAsReadline
loader = "use_lib_reline"
end
if loader
res, exit_status = Open3.capture2e("#{RUBY} -I#{__dir__} -Ilib -rhelper -e '#{loader}; Readline.readline(%{y or n?})'", stdin_data: "y\n")
Expand Down Expand Up @@ -915,26 +911,4 @@ def setup
use_ext_readline
super
end
end if defined?(ReadlineSo) && ENV["TEST_READLINE_OR_RELINE"] != "Reline"

class TestRelineAsReadline < Test::Unit::TestCase
include BasetestReadline

def setup
use_lib_reline
super
end

def teardown
finish_using_lib_reline
super
end

def get_default_internal_encoding
if RUBY_PLATFORM =~ /mswin|mingw/
Encoding.default_internal || Encoding::UTF_8
else
Reline::IOGate.encoding
end
end
end if defined?(Reline) && ENV["TEST_READLINE_OR_RELINE"] != "Readline"
end if defined?(ReadlineSo)
25 changes: 1 addition & 24 deletions test/readline/test_readline_history.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,34 +259,11 @@ def setup
use_ext_readline
super
end
end if defined?(::ReadlineSo) && defined?(::ReadlineSo::HISTORY) &&
ENV["TEST_READLINE_OR_RELINE"] != "Reline" &&
end if defined?(::ReadlineSo) && defined?(::ReadlineSo::HISTORY)
(
begin
ReadlineSo::HISTORY.clear
rescue NotImplementedError
false
end
)

class TestRelineAsReadlineHistory < Test::Unit::TestCase
include BasetestReadlineHistory

def setup
use_lib_reline
super
end

def teardown
finish_using_lib_reline
super
end

def get_default_internal_encoding
if RUBY_PLATFORM =~ /mswin|mingw/
Encoding.default_internal || Encoding::UTF_8
else
Reline::IOGate.encoding
end
end
end if defined?(Reline) && ENV["TEST_READLINE_OR_RELINE"] != "Readline"