summaryrefslogtreecommitdiff
path: root/test/iconv
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-15 05:21:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-15 05:21:00 +0000
commitc7afd1aef49c0dc459b3d9dda6ddc51e301f5473 (patch)
tree1e2c0439865b24873d53bd6da12ee829e9fc897a /test/iconv
parent1af93d6a495efcf06889f29b362467c7cb53d378 (diff)
* ext/iconv/iconv.c (iconv_create): cannot retry with given block.
[ruby-dev:39487] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/iconv')
-rw-r--r--test/iconv/test_basic.rb5
-rw-r--r--test/iconv/test_option.rb2
-rw-r--r--test/iconv/test_partial.rb2
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 340218b48b..b210fa498a 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