data-parser: A hard delimiter at end of line is not an empty field.

[pspp] / tests / language / data-io / get-data-txt.at

diff --git a/tests/language/data-io/get-data-txt.at b/tests/language/data-io/get-data-txt.at
index 3ba508c7c44420a0d6b2e0e8a81e866b2e315f77..f18fc978f8e04dab509cf0d30f8ec0c47ef415f9 100644 (file)
--- a/tests/language/data-io/get-data-txt.at
+++ b/tests/language/data-io/get-data-txt.at
@@ -36,9 +36,12 @@ begin data.
 ,4,,5
 6
 7,
+
 8 9
 0,1,,,
+
 ,,,,
+
 2
 
 3
@@ -47,7 +50,7 @@ begin data.
 end data.
 list.
 ])
-AT_CHECK([pspp -o pspp.csv get-data.sps])
+AT_CHECK([pspp -o pspp.csv get-data.sps], [0], [ignore])
 AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Data List
 A,B,C,D
@@ -69,21 +72,21 @@ begin data.
 # These records
 # are skipped.
 1      2       3       4
-1      2       3       @&t@
+1      2       3       4       @&t@
 1      2               4
-1      2               @&t@
+1      2               4       @&t@
 1              3       4
-1              3       @&t@
+1              3       4       @&t@
 1                      4
-1                      @&t@
+1                      4       @&t@
        2       3       4
-       2       3       @&t@
+       2       3       4       @&t@
        2               4
-       2               @&t@
+       2               4       @&t@
                3       4
-               3       @&t@
+               3       4       @&t@
                        4
-                       @&t@
+                       4       @&t@
 end data.
 list.
 ])
@@ -92,21 +95,21 @@ AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Data List
 A,B,C,D
 1.00,2.00,3.00,4.00
-1.00,2.00,3.00,.  @&t@
+1.00,2.00,3.00,4.00
+1.00,2.00,.  ,4.00
 1.00,2.00,.  ,4.00
-1.00,2.00,.  ,.  @&t@
 1.00,.  ,3.00,4.00
-1.00,.  ,3.00,.  @&t@
+1.00,.  ,3.00,4.00
 1.00,.  ,.  ,4.00
-1.00,.  ,.  ,.  @&t@
+1.00,.  ,.  ,4.00
+.  ,2.00,3.00,4.00
 .  ,2.00,3.00,4.00
-.  ,2.00,3.00,.  @&t@
 .  ,2.00,.  ,4.00
-.  ,2.00,.  ,.  @&t@
+.  ,2.00,.  ,4.00
+.  ,.  ,3.00,4.00
 .  ,.  ,3.00,4.00
-.  ,.  ,3.00,.  @&t@
 .  ,.  ,.  ,4.00
-.  ,.  ,.  ,.  @&t@
+.  ,.  ,.  ,4.00
 ])
 AT_CLEANUP