mame	2008-06-30 03:02:24 +0900 (Mon, 30 Jun 2008)

  New Revision: 17725

  Modified files:
    trunk/ChangeLog
    trunk/test/net/http/test_http.rb
    trunk/test/net/http/utils.rb

  Log:
    * test/net/http/test_http.rb (_test_request__file): specify encoding
      explicitly.
    
    * test/net/http/utils.rb: ditto.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/net/http/utils.rb?r1=17725&r2=17724&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17725&r2=17724&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/net/http/test_http.rb?r1=17725&r2=17724&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17724)
+++ ChangeLog	(revision 17725)
@@ -1,3 +1,10 @@
+Mon Jun 30 03:01:35 2008  Yusuke Endoh  <mame@t...>
+
+	* 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@r...>
 
 	* encoding.c (rb_utf8_encindex): defined.
Index: test/net/http/test_http.rb
===================================================================
--- test/net/http/test_http.rb	(revision 17724)
+++ test/net/http/test_http.rb	(revision 17725)
@@ -191,9 +191,9 @@
       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
     }
Index: test/net/http/utils.rb
===================================================================
--- test/net/http/utils.rb	(revision 17724)
+++ test/net/http/utils.rb	(revision 17725)
@@ -71,6 +71,7 @@
 
   $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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/