X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdictionary%2Fvalue-labels.at;h=1873d3779b36e8ed027e429dc0587c0ca37fcb5d;hb=012b9e4ecf47d844aea352b2c0b7dda80a7194bd;hp=b7e6eaf8d7499e2abc1829d598fec8ace060eb7c;hpb=c70c924972443e3ec2713e421815cbf959af2582;p=pspp

diff --git a/tests/language/dictionary/value-labels.at b/tests/language/dictionary/value-labels.at
index b7e6eaf8d7..1873d3779b 100644
--- a/tests/language/dictionary/value-labels.at
+++ b/tests/language/dictionary/value-labels.at
@@ -1,16 +1,16 @@
 dnl PSPP - a program for statistical analysis.
 dnl Copyright (C) 2017 Free Software Foundation, Inc.
-dnl 
+dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation, either version 3 of the License, or
 dnl (at your option) any later version.
-dnl 
+dnl
 dnl This program is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
-dnl 
+dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl
@@ -27,12 +27,12 @@ DISPLAY DICTIONARY.
 ])
 AT_CHECK([pspp -O format=csv value-labels.sps], [0], [dnl
 Table: Variables
-Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
-ad,1,,Scale,Input,8,Right,ADATE10,ADATE10,
-dt,2,,Scale,Input,8,Right,DATETIME20.0,DATETIME20.0,
+Name,Position,Measurement Level,Role,Width,Alignment,Print Format,Write Format
+ad,1,Scale,Input,8,Right,ADATE10,ADATE10
+dt,2,Scale,Input,8,Right,DATETIME20.0,DATETIME20.0
 
 Table: Value Labels
-Variable,Value,Label
+Variable Value,,Label
 ad,07/10/1982,label 1
 ,01/02/1993,label 2
 ,05/04/2003,label 3
@@ -52,24 +52,25 @@ END DATA.
 DISPLAY DICTIONARY.
 FREQUENCIES x/STAT=NONE.
 ])
-AT_CHECK([pspp -O format=csv value-labels.sps], [0], [dnl
+AT_CHECK([pspp -o pspp.csv -o pspp.txt value-labels.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Variables
-Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
-x,1,,Scale,Input,8,Right,F8.2,F8.2,
+Name,Position,Measurement Level,Role,Width,Alignment,Print Format,Write Format
+x,1,Scale,Input,8,Right,F8.2,F8.2
 
 Table: Value Labels
-Variable,Value,Label
+Variable Value,,Label
 x,1.00,one
 ,2.00,first line\nsecond line
 ,3.00,three
 
 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,
+,,Frequency,Percent,Valid Percent,Cumulative Percent
+Valid,one,1,33.3%,33.3%,33.3%
+,"first line
+second line",1,33.3%,33.3%,66.7%
+,three,1,33.3%,33.3%,100.0%
+Total,,3,100.0%,,
 ])
 AT_CLEANUP
 
@@ -90,37 +91,38 @@ GET FILE='value-labels.sav'.
 DISPLAY DICTIONARY.
 FREQUENCIES x/STAT=NONE.
 ])
-AT_CHECK([pspp -O format=csv get.sps], [0], [dnl
+AT_CHECK([pspp -o pspp.csv -o pspp.txt get.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Variables
-Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
-x,1,,Scale,Input,8,Right,F8.2,F8.2,
+Name,Position,Measurement Level,Role,Width,Alignment,Print Format,Write Format
+x,1,Scale,Input,8,Right,F8.2,F8.2
 
 Table: Value Labels
-Variable,Value,Label
+Variable Value,,Label
 x,1.00,one
 ,2.00,first line\nsecond line
 ,3.00,three
 
 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,
+,,Frequency,Percent,Valid Percent,Cumulative Percent
+Valid,one,1,33.3%,33.3%,33.3%
+,"first line
+second line",1,33.3%,33.3%,66.7%
+,three,1,33.3%,33.3%,100.0%
+Total,,3,100.0%,,
 ])
 AT_CLEANUP
 
-dnl Tests for a bug which caused VALUE LABELS to 
+dnl Tests for a bug which caused VALUE LABELS to
 dnl crash when given invalid syntax.
 AT_SETUP([VALUE LABELS invalid syntax bug])
 AT_DATA([value-labels.sps], [dnl
 DATA LIST LIST NOTABLE /a * pref * .
 BEGIN DATA.
-    1.00     1.00    
-    1.00     2.00    
-    2.00     1.00    
-    2.00     2.00    
+    1.00     1.00
+    1.00     2.00
+    2.00     1.00
+    2.00     2.00
 END DATA.
 
 VALUE LABELS /var=a 'label for a'.
@@ -135,7 +137,7 @@ AT_SETUP([VALUE LABELS trailing `/' bug])
 AT_DATA([value-labels.sps], [dnl
 DATA LIST LIST NOTABLE /X * .
 BEGIN DATA.
-1 
+1
 2
 3
 4