jeg2	2009-03-31 08:20:44 +0900 (Tue, 31 Mar 2009)

  New Revision: 23099

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23099

  Log:
    * test/csv/test_interface.rb, test/csv/test_serialization.rb:
      Trying more fixes some failing tests on Windows.

  Modified files:
    trunk/ChangeLog
    trunk/test/csv/test_interface.rb
    trunk/test/csv/test_serialization.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23098)
+++ ChangeLog	(revision 23099)
@@ -1,3 +1,8 @@
+Mon Mar 31 08:18:57 2009  James Edward Gray II  <jeg2@r...>
+
+	* test/csv/test_interface.rb, test/csv/test_serialization.rb:
+	  Trying more fixes some failing tests on Windows.
+
 Mon Mar 30 19:04:25 2009  Tanaka Akira  <akr@f...>
 
 	* .gdbinit (rp): show negative fixnum correctly.
Index: test/csv/test_interface.rb
===================================================================
--- test/csv/test_interface.rb	(revision 23098)
+++ test/csv/test_interface.rb	(revision 23099)
@@ -53,7 +53,7 @@
   end
 
   def test_parse
-    data = File.read(@path)
+    data = File.binread(@path)
     assert_equal( @expected,
                   CSV.parse(data, col_sep: "\t", row_sep: "\r\n") )
 
@@ -99,7 +99,7 @@
   end
 
   def test_shift  # aliased as gets() and readline()
-    CSV.open(@path, "r+", col_sep: "\t", row_sep: "\r\n") do |csv|
+    CSV.open(@path, "rb+", col_sep: "\t", row_sep: "\r\n") do |csv|
       assert_equal(@expected.shift, csv.shift)
       assert_equal(@expected.shift, csv.shift)
       assert_equal(nil, csv.shift)
@@ -178,19 +178,19 @@
     File.unlink(@path)
 
     lines = [{a: 1, b: 2, c: 3}, {a: 4, b: 5, c: 6}]
-    CSV.open(@path, "w", headers: [:b, :a, :c]) do |csv|
+    CSV.open(@path, "wb", headers: [:b, :a, :c]) do |csv|
       lines.each { |line| csv << line }
     end
 
     # test writing fields in the correct order
-    File.open(@path, "r") do |f|
+    File.open(@path, "rb") do |f|
       assert_equal("2,1,3", f.gets.strip)
       assert_equal("5,4,6", f.gets.strip)
     end
 
     # test reading CSV with headers
-    CSV.open( @path, "r", headers:    [:b, :a, :c],
-                          converters: :all ) do |csv|
+    CSV.open( @path, "rb", headers:    [:b, :a, :c],
+                           converters: :all ) do |csv|
       csv.each { |line| assert_equal(lines.shift, line.to_hash) }
     end
   end
@@ -199,20 +199,20 @@
     File.unlink(@path)
 
     lines = [{"a" => 1, "b" => 2, "c" => 3}, {"a" => 4, "b" => 5, "c" => 6}]
-    CSV.open(@path, "w", headers: "b|a|c", col_sep: "|") do |csv|
+    CSV.open(@path, "wb", headers: "b|a|c", col_sep: "|") do |csv|
       lines.each { |line| csv << line }
     end
 
     # test writing fields in the correct order
-    File.open(@path, "r") do |f|
+    File.open(@path, "rb") do |f|
       assert_equal("2|1|3", f.gets.strip)
       assert_equal("5|4|6", f.gets.strip)
     end
 
     # test reading CSV with headers
-    CSV.open( @path, "r", headers:    "b|a|c",
-                          col_sep:    "|",
-                          converters: :all ) do |csv|
+    CSV.open( @path, "rb", headers:    "b|a|c",
+                           col_sep:    "|",
+                           converters: :all ) do |csv|
       csv.each { |line| assert_equal(lines.shift, line.to_hash) }
     end
   end
@@ -221,23 +221,23 @@
     File.unlink(@path)
 
     lines = [{"a" => 1, "b" => 2, "c" => 3}, {"a" => 4, "b" => 5, "c" => 6}]
-    CSV.open( @path, "w", headers:       "b|a|c",
-                          write_headers: true,
-                          col_sep:       "|" ) do |csv|
+    CSV.open( @path, "wb", headers:       "b|a|c",
+                           write_headers: true,
+                           col_sep:       "|" ) do |csv|
       lines.each { |line| csv << line }
     end
 
     # test writing fields in the correct order
-    File.open(@path, "r") do |f|
+    File.open(@path, "rb") do |f|
       assert_equal("b|a|c", f.gets.strip)
       assert_equal("2|1|3", f.gets.strip)
       assert_equal("5|4|6", f.gets.strip)
     end
 
     # test reading CSV with headers
-    CSV.open( @path, "r", headers:    true,
-                          col_sep:    "|",
-                          converters: :all ) do |csv|
+    CSV.open( @path, "rb", headers:    true,
+                           col_sep:    "|",
+                           converters: :all ) do |csv|
       csv.each { |line| assert_equal(lines.shift, line.to_hash) }
     end
   end
@@ -245,7 +245,7 @@
   def test_append  # aliased add_row() and puts()
     File.unlink(@path)
 
-    CSV.open(@path, "w", col_sep: "\t", row_sep: "\r\n") do |csv|
+    CSV.open(@path, "wb", col_sep: "\t", row_sep: "\r\n") do |csv|
       @expected.each { |row| csv << row }
     end
 
@@ -254,7 +254,7 @@
     # same thing using CSV::Row objects
     File.unlink(@path)
 
-    CSV.open(@path, "w", col_sep: "\t", row_sep: "\r\n") do |csv|
+    CSV.open(@path, "wb", col_sep: "\t", row_sep: "\r\n") do |csv|
       @expected.each { |row| csv << CSV::Row.new(Array.new, row) }
     end
 
Index: test/csv/test_serialization.rb
===================================================================
--- test/csv/test_serialization.rb	(revision 23098)
+++ test/csv/test_serialization.rb	(revision 23099)
@@ -133,7 +133,7 @@
     test_class_dump
 
     data_file = File.join(File.dirname(__FILE__), "temp_test_data.csv")
-    CSV.dump(@names, File.open(data_file, "w"))
+    CSV.dump(@names, File.open(data_file, "wb"))
 
     assert(File.exist?(data_file))
     assert_equal(<<-END_IO_DUMP.gsub(/^\s*/, ""), File.read(data_file))

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