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 | 28aa3a401c1bd18965b2bab0e76eb8a2e36f111d (patch) | |
tree | e18dfd3a94d6402c244fecf188984b342aaa8bed /test/ruby/test_m17n.rb | |
parent | fdd0b16f380c51419ef47973c6ce637964759dc4 (diff) | |
download | ruby-28aa3a401c1bd18965b2bab0e76eb8a2e36f111d.tar.gz ruby-28aa3a401c1bd18965b2bab0e76eb8a2e36f111d.tar.xz ruby-28aa3a401c1bd18965b2bab0e76eb8a2e36f111d.zip |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@19357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_m17n.rb')
-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 a87822753..855653fa8 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 |