1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* test/ruby/test_m17n_comb.rb: feature changed in r20626.

follows it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-13 04:45:56 +00:00
parent ac6e87fc59
commit a6c69a7d35
2 changed files with 12 additions and 3 deletions

View file

@ -1,3 +1,8 @@
Sat Dec 13 13:41:44 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/ruby/test_m17n_comb.rb: feature changed in r20626.
follows it.
Sat Dec 13 13:03:20 2008 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c: use rb_usascii_str_new2 instead of rb_str_new2.

View file

@ -1099,7 +1099,11 @@ class TestM17NComb < Test::Unit::TestCase
next
end
if !s1.ascii_only? && !s2.ascii_only? && s1.encoding != s2.encoding
assert_raise(ArgumentError) { s1.scan(s2) }
if s1.valid_encoding?
assert_raise(Encoding::CompatibilityError) { s1.scan(s2) }
else
assert_raise(ArgumentError, /invalid byte sequence/) { s1.scan(s2) }
end
next
end
if !s1.valid_encoding?
@ -1418,7 +1422,7 @@ class TestM17NComb < Test::Unit::TestCase
next
end
if !str_enc_compatible?(s1, s2)
assert_raise(ArgumentError, desc) { doit.call }
assert_raise(Encoding::CompatibilityError, desc) { doit.call }
next
end
if !enccall(s1, :include?, s2)
@ -1476,7 +1480,7 @@ class TestM17NComb < Test::Unit::TestCase
next
end
if !str_enc_compatible?(s1, s2)
assert_raise(ArgumentError, desc) { doit.call }
assert_raise(Encoding::CompatibilityError, desc) { doit.call }
next
end
if !enccall(s1, :include?, s2)