[CSV-149]/[CSV-195] fix line number is not proper at EOF

Author: dota17

src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java

@@ -56,7 +56,8 @@ final class ExtendedBufferedReader extends BufferedReader {
     @Override
     public int read() throws IOException {
         final int current = super.read();
-        if (current == CR || current == LF && lastChar != CR) {
+        if ((current == CR || current == LF && lastChar != CR)
+            || (current == END_OF_STREAM && lastChar != CR && lastChar != LF && lastChar != END_OF_STREAM)) {
             eolCounter++;
         }
         lastChar = current;

src/test/java/org/apache/commons/csv/CSVParserTest.java

@@ -641,11 +641,11 @@ public void testGetRecordWithMultiLineValues() throws Exception {
             assertEquals(2, record.getRecordNumber());
             assertEquals(2, parser.getRecordNumber());
             assertNotNull(record = parser.nextRecord());
-            assertEquals(8, parser.getCurrentLineNumber());
+            assertEquals(9, parser.getCurrentLineNumber());
             assertEquals(3, record.getRecordNumber());
             assertEquals(3, parser.getRecordNumber());
             assertNull(record = parser.nextRecord());
-            assertEquals(8, parser.getCurrentLineNumber());
+            assertEquals(9, parser.getCurrentLineNumber());
             assertEquals(3, parser.getRecordNumber());
         }
     }
@@ -1195,11 +1195,11 @@ private void validateLineNumbers(final String lineSeparator) throws IOException
             assertNotNull(parser.nextRecord());
             assertEquals(2, parser.getCurrentLineNumber());
             assertNotNull(parser.nextRecord());
-            // Still 2 because the last line is does not have EOL chars
-            assertEquals(2, parser.getCurrentLineNumber());
+            // Read EOF without EOL should 3
+            assertEquals(3, parser.getCurrentLineNumber());
             assertNull(parser.nextRecord());
-            // Still 2 because the last line is does not have EOL chars
-            assertEquals(2, parser.getCurrentLineNumber());
+            // Read EOF without EOL should 3
+            assertEquals(3, parser.getCurrentLineNumber());
         }
     }
 

src/test/java/org/apache/commons/csv/issues/JiraCsv149Test.java

@@ -24,10 +24,8 @@
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-@Disabled
 public class JiraCsv149Test {
 
     @Test