From 182cf90d30f1319f094adcf4c37ea8921c348453 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 23 Jul 2013 18:00:26 +0000 Subject: fix test of r42101 [Feature #6626] rl_delete_text removes characters in line_buffer, but it doesn't move rl_point. Therefore it may cause invalid rl_point. On following case, test_input_metachar causes test_insert_text failure. (test_input_metachar_multibyte) is skipped because of locale) http://c5664.rubyci.org/~chkbuild/ruby-trunk/log/20130723T133302Z.log.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/readline/test_readline.rb | 62 +++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 42c84ab5aa..62b44f884c 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -312,33 +312,51 @@ class TestReadline < Test::Unit::TestCase end def test_insert_text - begin + str = "test_insert_text" + with_pipe {|r, w| w.write("\C-a\n")} # reset rl_point + assert_equal(0, Readline.point) + assert_equal(Readline, Readline.insert_text(str)) + assert_equal(str, Readline.line_buffer) + assert_equal(16, Readline.point) + assert_equal(get_default_internal_encoding, + Readline.line_buffer.encoding) + + Readline.delete_text(1, 3) + assert_equal("t_insert_text", Readline.line_buffer) + Readline.delete_text(11) + assert_equal("t_insert_te", Readline.line_buffer) + Readline.delete_text(-3...-1) + assert_equal("t_inserte", Readline.line_buffer) + Readline.delete_text(-3..-1) + assert_equal("t_inse", Readline.line_buffer) + Readline.delete_text(3..-3) + assert_equal("t_ise", Readline.line_buffer) + Readline.delete_text(3, 1) + assert_equal("t_ie", Readline.line_buffer) + Readline.delete_text(1..1) + assert_equal("tie", Readline.line_buffer) + Readline.delete_text(1...2) + assert_equal("te", Readline.line_buffer) + Readline.delete_text + assert_equal("", Readline.line_buffer) + rescue NotImplementedError + end if !/EditLine/n.match(Readline::VERSION) + + def test_delete_text str = "test_insert_text" + assert_equal(0, Readline.point) assert_equal(Readline, Readline.insert_text(str)) + assert_equal(16, Readline.point) assert_equal(str, Readline.line_buffer) - assert_equal(get_default_internal_encoding, - Readline.line_buffer.encoding) - - Readline.delete_text(1, 3) - assert_equal("t_insert_text", Readline.line_buffer) - Readline.delete_text(11) - assert_equal("t_insert_te", Readline.line_buffer) - Readline.delete_text(-3...-1) - assert_equal("t_inserte", Readline.line_buffer) - Readline.delete_text(-3..-1) - assert_equal("t_inse", Readline.line_buffer) - Readline.delete_text(3..-3) - assert_equal("t_ise", Readline.line_buffer) - Readline.delete_text(3, 1) - assert_equal("t_ie", Readline.line_buffer) - Readline.delete_text(1..1) - assert_equal("tie", Readline.line_buffer) - Readline.delete_text(1...2) - assert_equal("te", Readline.line_buffer) Readline.delete_text + + # NOTE: unexpected but GNU Readline's spec + assert_equal(16, Readline.point) assert_equal("", Readline.line_buffer) - rescue NotImplementedError - end + assert_equal(Readline, Readline.insert_text(str)) + assert_equal(32, Readline.point) + assert_equal("", Readline.line_buffer) + rescue NotImplementedError end if !/EditLine/n.match(Readline::VERSION) def test_modify_text_in_pre_input_hook -- cgit v1.2.3