From 7edda76f1597a92a3d07ab8b1f3ba7f1dee8798c Mon Sep 17 00:00:00 2001 From: mame Date: Sun, 29 Jun 2008 18:02:24 +0000 Subject: [PATCH] * test/net/http/test_http.rb (_test_request__file): specify encoding explicitly. * test/net/http/utils.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/net/http/test_http.rb | 4 ++-- test/net/http/utils.rb | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ce9c65420..d5ad8cb7df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Jun 30 03:01:35 2008 Yusuke Endoh + + * test/net/http/test_http.rb (_test_request__file): specify encoding + explicitly. + + * test/net/http/utils.rb: ditto. + Mon Jun 30 02:31:07 2008 NARUSE, Yui * encoding.c (rb_utf8_encindex): defined. diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb index 8b23edf61c..50d1fe2eae 100644 --- a/test/net/http/test_http.rb +++ b/test/net/http/test_http.rb @@ -191,9 +191,9 @@ module TestNetHTTP_version_1_2_methods assert_kind_of Net::HTTPResponse, res assert_not_nil res['content-length'] assert_equal $test_net_http_data.size, res['content-length'].to_i - f = StringIO.new + f = StringIO.new("".force_encoding("ASCII-8BIT")) res.read_body f - assert_equal $test_net_http_data.size, f.string.size + assert_equal $test_net_http_data.bytesize, f.string.bytesize assert_equal $test_net_http_data.encoding, f.string.encoding assert_equal $test_net_http_data, f.string } diff --git a/test/net/http/utils.rb b/test/net/http/utils.rb index 766bf71c46..e685a8ff61 100644 --- a/test/net/http/utils.rb +++ b/test/net/http/utils.rb @@ -71,6 +71,7 @@ module TestNetHTTPUtils $test_net_http = nil $test_net_http_data = (0...256).to_a.map {|i| i.chr }.join('') * 64 + $test_net_http_data.force_encoding("ASCII-8BIT") $test_net_http_data_type = 'application/octet-stream' class Servlet < WEBrick::HTTPServlet::AbstractServlet