From 961101af6bfb7b9256a8183ce44804c476e5157a Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 21 Oct 2008 02:34:07 +0000 Subject: * ext/iconv/iconv.c (strip_glibc_option, map_charset): check if encoding is a string. based on the patch by Hiroshi Moriyama at [ruby-dev:36811]. * test/iconv/test_basic.rb (test_invalid_arguments): added tests. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/iconv/test_basic.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'test') diff --git a/test/iconv/test_basic.rb b/test/iconv/test_basic.rb index ea564e91f..394d271bc 100644 --- a/test/iconv/test_basic.rb +++ b/test/iconv/test_basic.rb @@ -43,6 +43,13 @@ class TestIconv::Basic < TestIconv assert_equal("#{SJIS_STR}\n"*2, output) end + def test_invalid_arguments + assert_raise(TypeError) { Iconv.new(nil, 'Shift_JIS') } + assert_raise(TypeError) { Iconv.new('Shift_JIS', nil) } + assert_raise(TypeError) { Iconv.open(nil, 'Shift_JIS') } + assert_raise(TypeError) { Iconv.open('Shift_JIS', nil) } + end + def test_unknown_encoding assert_raise(Iconv::InvalidEncoding) { Iconv.iconv("utf-8", "X-UKNOWN", "heh") } end -- cgit