diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:48:07 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:48:07 +0000 |
commit | 965258fae39c4e21216c58b077204fb65f174f16 (patch) | |
tree | 9c98259333474c06c38707df5fbc1f6b05dae47a /test | |
parent | 4fe744b10706a62196957d1d9c45e1f63f9dfdd9 (diff) |
merges r25343 from trunk into ruby_1_9_1.
--
* ext/iconv/iconv.c (iconv_create): cannot retry with given block.
[ruby-dev:39487]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/iconv/test_basic.rb | 5 | ||||
-rw-r--r-- | test/iconv/test_option.rb | 2 | ||||
-rw-r--r-- | test/iconv/test_partial.rb | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/iconv/test_basic.rb b/test/iconv/test_basic.rb index 394d271bc1..2575b22eb9 100644 --- a/test/iconv/test_basic.rb +++ b/test/iconv/test_basic.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "utils.rb") +require File.expand_path("../utils.rb", __FILE__) class TestIconv::Basic < TestIconv def test_euc2sjis @@ -52,5 +52,8 @@ class TestIconv::Basic < TestIconv def test_unknown_encoding assert_raise(Iconv::InvalidEncoding) { Iconv.iconv("utf-8", "X-UKNOWN", "heh") } + assert_raise(Iconv::InvalidEncoding, '[ruby-dev:39487]') { + Iconv.iconv("X-UNKNOWN-1", "X-UNKNOWN-2") {break} + } end end if defined?(TestIconv) diff --git a/test/iconv/test_option.rb b/test/iconv/test_option.rb index b899ba2db1..e81df9d850 100644 --- a/test/iconv/test_option.rb +++ b/test/iconv/test_option.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "utils.rb") +require File.expand_path("../utils.rb", __FILE__) class TestIconv::Option < TestIconv def test_ignore_option diff --git a/test/iconv/test_partial.rb b/test/iconv/test_partial.rb index aa4d0ba250..a98960b070 100644 --- a/test/iconv/test_partial.rb +++ b/test/iconv/test_partial.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "utils.rb") +require File.expand_path("../utils.rb", __FILE__) class TestIconv::Partial < TestIconv def test_partial_ascii |