summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 18:02:24 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-29 18:02:24 +0000
commit7edda76f1597a92a3d07ab8b1f3ba7f1dee8798c (patch)
tree85553c61ed2beedf22765e3ad5b6848b4b4b227f
parent04d83114a616daa8e1586f8d2cc71b209beac3d4 (diff)
* 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
-rw-r--r--ChangeLog7
-rw-r--r--test/net/http/test_http.rb4
-rw-r--r--test/net/http/utils.rb1
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ce9c654204..d5ad8cb7df4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 30 03:01:35 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * 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 <naruse@ruby-lang.org>
* encoding.c (rb_utf8_encindex): defined.
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
index 8b23edf61c5..50d1fe2eae7 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 766bf71c46a..e685a8ff614 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