https://github.com/manifold-systems/manifold/issues/622

- handle empty trailing values

Author: rsmckinney

manifold-deps-parent/manifold-csv-rt/src/main/java/manifold/csv/rt/parser/CsvTokenizer.java

@@ -164,7 +164,7 @@ else if( quoted )
                       : _content.charAt( _pos - 1 ) == '\r'
                         ? _pos - 1
                         : _pos;
-            int length = end - offset;
+            int length = end > offset ? end - offset : 0;
             boolean emptyLine = length <= 0 && (_prevToken == null || _prevToken.isLastInRecord());
             if( !emptyLine )
             {

manifold-deps-parent/manifold-csv-test/src/test/java/manifold/csv/CsvTest.java

@@ -25,6 +25,7 @@
 import abc.csv.insurance_sample_comma.insurance_sample_commaItem;
 import abc.csv.Cake;
 import abc.csv.Cake.CakeItem;
+import abc.csv.MissingLastColumn;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.math.BigDecimal;
@@ -37,9 +38,7 @@
 
 import org.junit.Test;
 
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 public class CsvTest
 {
@@ -102,4 +101,23 @@ public void testIndentedFile()
       assertEquals(data[i][2], item.getCake());
     }
   }
+
+  @Test
+  public void testMissingLastColumn()
+  {
+    MissingLastColumn items = MissingLastColumn.fromSource();
+    assertEquals( 3, items.size() );
+
+    assertEquals( "", items.get( 0 ).getCol1() );
+    assertEquals( 1, (int)items.get( 0 ).getCol2() );
+    assertEquals( "", items.get( 0 ).getCol3() );
+
+    assertEquals( "", items.get( 1 ).getCol1() );
+    assertEquals( 2, (int)items.get( 1 ).getCol2() );
+    assertEquals( "", items.get( 1 ).getCol3() );
+
+    assertEquals( "", items.get( 2 ).getCol1() );
+    assertNull( items.get( 2 ).getCol2() );
+    assertEquals( "", items.get( 2 ).getCol3() );
+  }
 }

manifold-deps-parent/manifold-csv-test/src/test/resources/abc/csv/MissingLastColumn.csv

@@ -0,0 +1,4 @@
+col1,col2,col3
+,1,
+,2,
+,,