summaryrefslogtreecommitdiff
path: root/test/csv
diff options
context:
space:
mode:
authorjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-30 23:20:44 +0000
committerjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-30 23:20:44 +0000
commit8e2eedf46b39fa82ca68dd2ea929616d2b7b356a (patch)
treeedcd885b1b4c90291d8aeed252d0bbf2f9417137 /test/csv
parent2a58eebd8f3b0f359c25c5e20be3d8045aa1651a (diff)
* test/csv/test_interface.rb, test/csv/test_serialization.rb:
Trying more fixes some failing tests on Windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/csv')
-rw-r--r--test/csv/test_interface.rb40
-rw-r--r--test/csv/test_serialization.rb2
2 files changed, 21 insertions, 21 deletions
diff --git a/test/csv/test_interface.rb b/test/csv/test_interface.rb
index e1f07f7..5aedbbb 100644
--- a/test/csv/test_interface.rb
+++ b/test/csv/test_interface.rb
@@ -53,7 +53,7 @@ class TestCSVInterface < Test::Unit::TestCase
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 @@ class TestCSVInterface < Test::Unit::TestCase
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 @@ class TestCSVInterface < Test::Unit::TestCase
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 @@ class TestCSVInterface < Test::Unit::TestCase
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 @@ class TestCSVInterface < Test::Unit::TestCase
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 @@ class TestCSVInterface < Test::Unit::TestCase
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 @@ class TestCSVInterface < Test::Unit::TestCase
# 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
diff --git a/test/csv/test_serialization.rb b/test/csv/test_serialization.rb
index f8e6df1..5f0201e 100644
--- a/test/csv/test_serialization.rb
+++ b/test/csv/test_serialization.rb
@@ -133,7 +133,7 @@ class TestSerialization < Test::Unit::TestCase
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))