diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-24 07:18:40 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-24 07:18:40 +0000 |
| commit | a185b734fea2408a99c81384e8d2eb2bc3d429ef (patch) | |
| tree | c09ec16077048d333fe912769ddeb120f2eda1e4 /test | |
| parent | 06b911ea003c34a8f7d2915c935517098051f69f (diff) | |
merge revision(s) 25343:
* 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_8_7@25902 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 ea564e91f1..6640fab8e9 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 @@ -45,5 +45,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 a1f3457c31..8138e130fa 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 |