Author: sebb
Date: Thu Mar 29 16:03:32 2012
New Revision: 1306948
URL: http://svn.apache.org/viewvc?rev=1306948&view=rev
Log:
CSV-85 Allow comments to be returned in CSVRecord
More test cases
Modified:
commons/proper/csv/trunk/src/test/resources/CSVFileParser/README.txt
commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_default.txt
commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_ignoreEmpty.txt
Modified: commons/proper/csv/trunk/src/test/resources/CSVFileParser/README.txt
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/resources/CSVFileParser/README.txt?rev=1306948&r1=1306947&r2=1306948&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/test/resources/CSVFileParser/README.txt
(original)
+++ commons/proper/csv/trunk/src/test/resources/CSVFileParser/README.txt Thu
Mar 29 16:03:32 2012
@@ -13,6 +13,7 @@ The settings have the form (see test sou
IgnoreEmpty=true|false
IgnoreSpaces=true|false
CommentStart=char
+CheckComments - whether the test should check comment fields as well
The second line is the expected output from invoking CSVFormat#toString() on
the parsing format
Modified:
commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_default.txt
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_default.txt?rev=1306948&r1=1306947&r2=1306948&view=diff
==============================================================================
---
commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_default.txt
(original)
+++
commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_default.txt
Thu Mar 29 16:03:32 2012
@@ -1,10 +1,11 @@
-testCSV85.csv CommentStart=#
+testCSV85.csv CommentStart=# CheckComments
Delimiter=<,> Encapsulator=<"> CommentStart=<#>
-5:[a, b, c, e, f]
+# Comment 1
+5:[a, b, c, e, f]#Comment 1
# Very Long
# Comment 2
-5:[g, h, i, j, k]
+5:[g, h, i, j, k]#Very Long\nComment 2
# Very Long
-1:[]
+1:[]#Very Long
# Comment 3
-5:[l, m, n, o, p]
\ No newline at end of file
+5:[l, m, n, o, p]#Comment 3
\ No newline at end of file
Modified:
commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_ignoreEmpty.txt
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_ignoreEmpty.txt?rev=1306948&r1=1306947&r2=1306948&view=diff
==============================================================================
---
commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_ignoreEmpty.txt
(original)
+++
commons/proper/csv/trunk/src/test/resources/CSVFileParser/testCSV85_ignoreEmpty.txt
Thu Mar 29 16:03:32 2012
@@ -1,10 +1,10 @@
-testCSV85.csv CommentStart=#
-Delimiter=<,> Encapsulator=<"> CommentStart=<#>
-5:[a, b, c, e, f]
+testCSV85.csv CommentStart=# IgnoreEmpty=true CheckComments
+Delimiter=<,> Encapsulator=<"> CommentStart=<#> EmptyLines:ignored
+# Comment 1
+5:[a, b, c, e, f]#Comment 1
# Very Long
# Comment 2
-5:[g, h, i, j, k]
+5:[g, h, i, j, k]#Very Long\nComment 2
# Very Long
-1:[]
# Comment 3
-5:[l, m, n, o, p]
\ No newline at end of file
+5:[l, m, n, o, p]#Very Long\nComment 3
\ No newline at end of file
