diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-15 05:17:18 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-15 05:17:18 +0000 |
commit | 5fc383f9a3028922bcfa6fb04f8ad8c98c90aeeb (patch) | |
tree | e18dfd3a94d6402c244fecf188984b342aaa8bed /test | |
parent | b140cda1d6bfec64296b2a5f12a718b03fe802b5 (diff) | |
download | ruby-5fc383f9a3028922bcfa6fb04f8ad8c98c90aeeb.tar.gz |
* encoding.c (rb_enc_compatible): accepst other than strings and
regexps. [ruby-core:18595]
* encoding.c (rb_enc_get_index): works files and encodings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_m17n.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index a878227534..855653fa81 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1280,7 +1280,12 @@ class TestM17N < Test::Unit::TestCase end def test_compatible - assert_raise(TypeError) {Encoding.compatible?("",0)} + assert_nil Encoding.compatible?("",0) + assert_equal(Encoding::UTF_8, Encoding.compatible?(Encoding::UTF_8, Encoding::UTF_8)) + assert_equal(Encoding::UTF_8, Encoding.compatible?(Encoding::UTF_8, Encoding::US_ASCII)) + assert_equal(Encoding::ASCII_8BIT, + Encoding.compatible?(Encoding::ASCII_8BIT, Encoding::US_ASCII)) + assert_nil Encoding.compatible?(Encoding::UTF_8, Encoding::ASCII_8BIT) end def test_force_encoding |