@@ -94,11 +94,18 @@ public void testNextToken2() throws IOException {
9494 public void testNextToken2EmptyLines () throws IOException {
9595 final String code =
9696 "1,2,3,\n " + // 1
97+ "\n " + // 1b
98+ "\n " + // 1c
9799 "a,b x,c#no-comment\n " + // 2
98100 "#foo\n " + // 3
99101 "\n " + // 4
102+ "\n " + // 4b
100103 "d,e,#no-comment\n " + // 5
104+ "\n " + // 5b
105+ "\n " + // 5c
101106 "# penultimate comment\n " + // 6
107+ "\n " + // 6b
108+ "\n " + // 6c
102109 "# Final comment\n " ; // 7
103110 CSVFormat format = CSVFormat .DEFAULT .withCommentStart ('#' ).withEmptyLinesIgnored (false );
104111 assertFalse ("Should not ignore empty lines" , format .isEmptyLinesIgnored ());
@@ -110,15 +117,22 @@ public void testNextToken2EmptyLines() throws IOException {
110117 assertTokenEquals (TOKEN , "2" , parser .nextToken (new Token ()));
111118 assertTokenEquals (TOKEN , "3" , parser .nextToken (new Token ()));
112119 assertTokenEquals (EORECORD , "" , parser .nextToken (new Token ())); // 1
120+ assertTokenEquals (EORECORD , "" , parser .nextToken (new Token ())); // 1b
121+ assertTokenEquals (EORECORD , "" , parser .nextToken (new Token ())); // 1c
113122 assertTokenEquals (TOKEN , "a" , parser .nextToken (new Token ()));
114123 assertTokenEquals (TOKEN , "b x" , parser .nextToken (new Token ()));
115124 assertTokenEquals (EORECORD , "c#no-comment" , parser .nextToken (new Token ())); // 2
116125 assertTokenEquals (COMMENT , "" , parser .nextToken (new Token ())); // 3
117126 assertTokenEquals (EORECORD , "" , parser .nextToken (new Token ())); // 4
127+ assertTokenEquals (EORECORD , "" , parser .nextToken (new Token ())); // 4b
118128 assertTokenEquals (TOKEN , "d" , parser .nextToken (new Token ()));
119129 assertTokenEquals (TOKEN , "e" , parser .nextToken (new Token ()));
120130 assertTokenEquals (EORECORD , "#no-comment" , parser .nextToken (new Token ())); // 5
131+ assertTokenEquals (EORECORD , "" , parser .nextToken (new Token ())); // 5b
132+ assertTokenEquals (EORECORD , "" , parser .nextToken (new Token ())); // 5c
121133 assertTokenEquals (COMMENT , "" , parser .nextToken (new Token ())); // 6
134+ assertTokenEquals (EORECORD , "" , parser .nextToken (new Token ())); // 6b
135+ assertTokenEquals (EORECORD , "" , parser .nextToken (new Token ())); // 6c
122136 assertTokenEquals (COMMENT , "" , parser .nextToken (new Token ())); // 7
123137 assertTokenEquals (EOF , "" , parser .nextToken (new Token ()));
124138 assertTokenEquals (EOF , "" , parser .nextToken (new Token ()));
0 commit comments