From e3b6c7c7ebca1b051dbaa6f33494e92f5638fcc9 Mon Sep 17 00:00:00 2001 From: kou Date: Sun, 14 Apr 2019 21:01:51 +0000 Subject: Import CSV 3.0.8 This includes performance improvements and backward incompatibility fixes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/csv/test_encodings.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'test/csv/test_encodings.rb') diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb index 01101f1e09..64ea36a9a4 100755 --- a/test/csv/test_encodings.rb +++ b/test/csv/test_encodings.rb @@ -256,12 +256,13 @@ class TestCSVEncodings < Test::Unit::TestCase end def test_invalid_encoding_row_error - csv = CSV.new("invalid,\xF8\r\nvalid,x\r\n".force_encoding("UTF-8"), - encoding: "UTF-8") + csv = CSV.new("valid,x\rinvalid,\xF8\r".force_encoding("UTF-8"), + encoding: "UTF-8", row_sep: "\r") error = assert_raise(CSV::MalformedCSVError) do csv.shift + csv.shift end - assert_equal("Invalid byte sequence in UTF-8 in line 1.", + assert_equal("Invalid byte sequence in UTF-8 in line 2.", error.message) end @@ -270,9 +271,9 @@ class TestCSVEncodings < Test::Unit::TestCase def assert_parses(fields, encoding, options = { }) encoding = Encoding.find(encoding) unless encoding.is_a? Encoding orig_fields = fields - fields = encode_ary(fields, encoding) + fields = encode_ary(fields, encoding) data = ary_to_data(fields, options) - parsed = CSV.parse(data, options) + parsed = CSV.parse(data, options) assert_equal(fields, parsed) parsed.flatten.each_with_index do |field, i| assert_equal(encoding, field.encoding, "Field[#{i + 1}] was transcoded.") -- cgit v1.2.3