summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-26 14:30:30 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-26 14:30:30 +0000
commit6dee0fab9b72b9c185fa742685f6486de9373243 (patch)
tree78cc93611ad0e5cc9dee981f60b647d10398064e /test
parent74ab20eb3756f0061c89c2acda5ac972bd9cf69e (diff)
* lib/csv.rb (CSV.read, CSV.readlines): added. works as IO.read and
IO.readlines in CSV format. * lib/csv.rb (CSV.parse): [CAUTION] behavior changed. in the past, CSV.parse accepts a filename to be read-opened (it was just a shortcut of CSV.open(filename, 'r')). now CSV.parse accepts a string or a stream to be parsed e.g. CSV.parse("1,2\n3,r") #=> [['1', '2'], ['3', '4']] * test/csv/test_csv.rb: follow above changes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/csv/test_csv.rb78
1 files changed, 49 insertions, 29 deletions
diff --git a/test/csv/test_csv.rb b/test/csv/test_csv.rb
index eca88321f0c..929d07a7867 100644
--- a/test/csv/test_csv.rb
+++ b/test/csv/test_csv.rb
@@ -2,7 +2,7 @@ require 'test/unit'
require 'tempfile'
require 'fileutils'
-require 'csv'
+require '../lib/csv.rb'
class CSV
class StreamBuf
@@ -529,39 +529,40 @@ public
end
def test_s_parse
- reader = CSV.parse(@infile)
- assert_instance_of(CSV::IOReader, reader)
- reader.close
+ result = CSV.parse(File.read(@infile))
+ assert_instance_of(Array, result)
+ assert_instance_of(Array, result[0])
- reader = CSV.parse(@infile)
- assert_instance_of(CSV::IOReader, reader)
- reader.close
+ result = CSV.parse(File.read(@infile))
+ assert_instance_of(Array, result)
+ assert_instance_of(Array, result[0])
- reader = CSV.parse(@infile, ?;)
- assert_instance_of(CSV::IOReader, reader)
- reader.close
+ assert_equal([], CSV.parse(""))
+ assert_equal([[nil]], CSV.parse("\n"))
- CSV.parse(@infile) do |row|
+ CSV.parse(File.read(@infile)) do |row|
assert_instance_of(Array, row)
break
end
- CSV.parse(@infiletsv, ?\t) do |row|
+ CSV.parse(File.read(@infiletsv), ?\t) do |row|
assert_instance_of(Array, row)
break
end
- assert_raises(Errno::ENOENT) do
- CSV.parse("NoSuchFileOrDirectory")
+ CSV.parse("") do |row|
+ assert(false)
end
- assert_raises(Errno::ENOENT) do
- CSV.parse("NoSuchFileOrDirectory", ?;)
+ count = 0
+ CSV.parse("\n") do |row|
+ assert_equal([nil], row)
+ count += 1
end
+ assert_equal(1, count)
- CSV.parse(@emptyfile) do |row|
- assert_fail("Must not reach here")
- end
+ assert_equal([["a|b-c|d"]], CSV.parse("a|b-c|d"))
+ assert_equal([["a", "b"], ["c", "d"]], CSV.parse("a|b-c|d", "|", "-"))
end
def test_s_open_writer
@@ -824,15 +825,13 @@ public
assert_equal(col, row)
end
- row = CSV.parse_line("a,b,c", nil, nil)
- assert_equal(['a', 'b', 'c'], row)
-
- row = CSV.parse_line("a,b,c", nil, ?b)
- assert_equal(['a', nil], row)
-
- row = CSV.parse_line("a,b,c", nil, "c")
- assert_equal(['a', 'b', nil], row)
-
+ assert_equal(['a', 'b', 'c'], CSV.parse_line("a,b,c", nil, nil))
+ assert_equal(['a', nil], CSV.parse_line("a,b,c", nil, ?b))
+ assert_equal(['a', 'b', nil], CSV.parse_line("a,b,c", nil, "c"))
+ assert_equal([nil], CSV.parse_line(""))
+ assert_equal([nil], CSV.parse_line("\n"))
+ assert_equal([""], CSV.parse_line("\"\"\n"))
+
# Illegal format.
buf = []
row = CSV.parse_line("a,b,\"c\"\ra")
@@ -1696,6 +1695,10 @@ public
assert_equal([nil], reader.shift)
assert_equal(['abc'], reader.shift)
+ reader = CSV::Reader.create("ab\ncdabcef", "abc", "\n")
+ assert_equal(['ab'], reader.shift)
+ assert_equal(['cd', "ef"], reader.shift)
+
# EOF while fs/rs matching
reader = CSV::Reader.create("ab", 'ab-', "xyz")
assert_equal(['ab'], reader.shift)
@@ -1711,7 +1714,7 @@ public
assert_equal([nil, ",,", nil], reader.shift)
end
- def test_foreach
+ def test_s_foreach
File.open(@outfile, "w") do |f|
f << "1,2,3\n4,5,6"
end
@@ -1730,4 +1733,21 @@ public
}
assert_equal([['1', '2', '3'], ['4', '5', '6']], row)
end
+
+ def test_s_readlines
+ File.open(@outfile, "w") do |f|
+ f << "1,2,3\n4,5,6"
+ end
+ assert_equal([["1", "2", "3"], ["4", "5", "6"]], CSV.readlines(@outfile))
+ assert_equal([["1", "2", nil], [nil, "5", "6"]], CSV.readlines(@outfile, "3\n4"))
+ end
+
+ def test_s_read
+ File.open(@outfile, "w") do |f|
+ f << "1,2,3\n4,5,6"
+ end
+ assert_equal([["1", "2", "3"], ["4", "5", "6"]], CSV.read(@outfile))
+ assert_equal([["1", "2"]], CSV.read(@outfile, 3))
+ assert_equal([[nil], ["4", nil]], CSV.read(@outfile, 3, 5))
+ end
end