X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdictionary%2Fvalue-labels.at;h=b3a2f8f8599391bdd2c3c5527cabaf2cea0c2ee4;hb=c7db015cdd7470334adafd940eda792c07a46126;hp=feec9d8627fa67149d787fea79ac62d90b585bb7;hpb=038deb761907154dd916c6625aa20600f823a84c;p=pspp

diff --git a/tests/language/dictionary/value-labels.at b/tests/language/dictionary/value-labels.at
index feec9d8627..b3a2f8f859 100644
--- a/tests/language/dictionary/value-labels.at
+++ b/tests/language/dictionary/value-labels.at
@@ -10,19 +10,84 @@ VALUE LABELS ad 'july 10, 1982' 'label 1'
 DISPLAY DICTIONARY.
 ])
 AT_CHECK([pspp -O format=csv value-labels.sps], [0], [dnl
-Variable,Description,,Position
-ad,Format: ADATE10,,1
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-,07/10/1982,label 1,
-,01/02/1993,label 2,
-,05/04/2003,label 3,
-dt,Format: DATETIME20.0,,2
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-,12-APR-2011 06:09:56,label 4,
+Variable,Description,Position
+ad,"Format: ADATE10
+
+Value,Label
+07/10/1982,label 1
+01/02/1993,label 2
+05/04/2003,label 3",1
+dt,"Format: DATETIME20.0
+
+Value,Label
+12-APR-2011 06:09:56,label 4",2
+])
+AT_CLEANUP
+
+AT_SETUP([VALUE LABELS with new-line])
+AT_DATA([value-labels.sps], [dnl
+DATA LIST LIST NOTABLE /x.
+VALUE LABELS x 1 'one' 2 'first line\nsecond line' 3 'three'.
+BEGIN DATA.
+1
+2
+3
+END DATA.
+DISPLAY DICTIONARY.
+FREQUENCIES x/STAT=NONE.
+])
+AT_CHECK([pspp -O format=csv value-labels.sps], [0], [dnl
+Variable,Description,Position
+x,"Format: F8.2
+
+Value,Label
+1.00,one
+2.00,first line\nsecond line
+3.00,three",1
+
+Table: x
+Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
+one,1.00,1,33.33,33.33,33.33
+"first line
+second line",2.00,1,33.33,33.33,66.67
+three,3.00,1,33.33,33.33,100.00
+Total,,3,100.0,100.0,
+])
+AT_CLEANUP
+
+AT_SETUP([VALUE LABELS with new-line in system file])
+AT_DATA([save.sps], [dnl
+DATA LIST LIST NOTABLE /x.
+VALUE LABELS x 1 'one' 2 'first line\nsecond line' 3 'three'.
+BEGIN DATA.
+1
+2
+3
+END DATA.
+SAVE OUTFILE='value-labels.sav'.
+])
+AT_CHECK([pspp -O format=csv save.sps])
+AT_DATA([get.sps], [dnl
+GET FILE='value-labels.sav'.
+DISPLAY DICTIONARY.
+FREQUENCIES x/STAT=NONE.
+])
+AT_CHECK([pspp -O format=csv get.sps], [0], [dnl
+Variable,Description,Position
+x,"Format: F8.2
+
+Value,Label
+1.00,one
+2.00,first line\nsecond line
+3.00,three",1
+
+Table: x
+Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
+one,1.00,1,33.33,33.33,33.33
+"first line
+second line",2.00,1,33.33,33.33,66.67
+three,3.00,1,33.33,33.33,100.00
+Total,,3,100.0,100.0,
 ])
 AT_CLEANUP