diff options
Diffstat (limited to 'test/ruby/test_io_m17n.rb')
| -rw-r--r-- | test/ruby/test_io_m17n.rb | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index 6f5e686c42..976aae8c2e 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -220,33 +220,27 @@ EOT end def test_s_pipe_invalid - r, w = IO.pipe("utf-8", "euc-jp", :invalid=>:replace) - w << "\x80" - w.close - assert_equal("?", r.read) - ensure - r.close if r && !r.closed? - w.close if w && !w.closed? + with_pipe("utf-8", "euc-jp", :invalid=>:replace) {|r, w| + w << "\x80" + w.close + assert_equal("?", r.read) + } end def test_s_pipe_undef - r, w = IO.pipe("utf-8:euc-jp", :undef=>:replace) - w << "\ufffd" - w.close - assert_equal("?", r.read) - ensure - r.close if r && !r.closed? - w.close if w && !w.closed? + with_pipe("utf-8:euc-jp", :undef=>:replace) {|r, w| + w << "\ufffd" + w.close + assert_equal("?", r.read) + } end def test_s_pipe_undef_replace_string - r, w = IO.pipe("utf-8:euc-jp", :undef=>:replace, :replace=>"X") - w << "\ufffd" - w.close - assert_equal("X", r.read) - ensure - r.close if r && !r.closed? - w.close if w && !w.closed? + with_pipe("utf-8:euc-jp", :undef=>:replace, :replace=>"X") {|r, w| + w << "\ufffd" + w.close + assert_equal("X", r.read) + } end def test_dup @@ -572,6 +566,11 @@ EOT assert_equal(eucjp, r.read) } + e = assert_raise(ArgumentError) {with_pipe("UTF-8", "UTF-8".encode("UTF-32BE")) {}} + assert_match(/invalid name encoding/, e.message) + e = assert_raise(ArgumentError) {with_pipe("UTF-8".encode("UTF-32BE")) {}} + assert_match(/invalid name encoding/, e.message) + ENCS.each {|enc| with_pipe(enc) {|r, w| w << "\xc2\xa1" |