From 9adecf3a7f532ed7932786b9b656f364860788e6 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 19 Dec 2007 17:02:29 +0000 Subject: * string.c (rb_str_rindex_m): too much adjustment. * re.c (reg_match_pos): pos adjustment should be based on characters. * test/ruby/test_m17n.rb (TestM17N::test_str_insert): test updated to check negative offset behavior. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14340 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_m17n.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'test/ruby') diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 3681a8e15..d723470dd 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1303,7 +1303,7 @@ class TestM17N < Test::Unit::TestCase end def test_str_insert - combination(STRINGS, -2..2, STRINGS) {|s1, nth, s2| + combination(STRINGS, 0..2, STRINGS) {|s1, nth, s2| t1 = s1.dup t2 = s1.dup begin @@ -1317,6 +1317,18 @@ class TestM17N < Test::Unit::TestCase assert_equal(t1, t2, "t=#{encdump s1}; t.insert(#{nth},#{encdump s2}); t") assert_equal(e1.class, e2.class, "begin #{encdump s1}.insert(#{nth},#{encdump s2}); rescue ArgumentError, IndexError => e; e end") } + combination(STRINGS, -2..-1, STRINGS) {|s1, nth, s2| + next if s1.length + nth < 0 + next unless s1.valid_encoding? + next unless s2.valid_encoding? + t1 = s1.dup + begin + t1.insert(nth, s2) + slen = s2.length + assert_equal(t1[nth-slen+1,slen], s2, "t=#{encdump s1}; t.insert(#{nth},#{encdump s2}); t") + rescue ArgumentError, IndexError => e + end + } end def test_str_intern -- cgit