X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdata-io%2Fget-data-spreadsheet.at;h=cf380da1f3e7469e176b7585b52db127fc2f6ec2;hb=fe829ccb26aa877de1068a3f1e237930ea8f2d34;hp=dc812fd8faf469ad7728d820c4e1c14038d10602;hpb=77e2017715a58c01d3e63ad90fb28b5e39eb2a31;p=pspp

diff --git a/tests/language/data-io/get-data-spreadsheet.at b/tests/language/data-io/get-data-spreadsheet.at
index dc812fd8fa..cf380da1f3 100644
--- a/tests/language/data-io/get-data-spreadsheet.at
+++ b/tests/language/data-io/get-data-spreadsheet.at
@@ -38,10 +38,10 @@ LIST.
 AT_CHECK([pspp -o pspp.csv get-data.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Variables
-Name,Position,Print Format,Write Format,Missing Values
-VAR001,1,F8.2,F8.2,
-VAR002,2,A8,A8,
-VAR003,3,F8.2,F8.2,
+Name,Position,Print Format,Write Format
+VAR001,1,F8.2,F8.2
+VAR002,2,A8,A8
+VAR003,3,F8.2,F8.2
 
 Table: Data List
 VAR001,VAR002,VAR003
@@ -63,10 +63,10 @@ LIST.
 AT_CHECK([pspp -o pspp.csv get-data.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Variables
-Name,Position,Print Format,Write Format,Missing Values
-V1,1,F8.2,F8.2,
-V2,2,A8,A8,
-VAR001,3,F8.2,F8.2,
+Name,Position,Print Format,Write Format
+V1,1,F8.2,F8.2
+V2,2,A8,A8
+VAR001,3,F8.2,F8.2
 
 Table: Data List
 V1,V2,VAR001
@@ -87,10 +87,10 @@ LIST.
 ])
 AT_CHECK([pspp -O format=csv get-data.sps], [0], [dnl
 Table: Variables
-Name,Position,Print Format,Write Format,Missing Values
-name,1,A8,A8,
-id,2,F8.2,F8.2,
-height,3,F8.2,F8.2,
+Name,Position,Print Format,Write Format
+name,1,A8,A8
+id,2,F8.2,F8.2
+height,3,F8.2,F8.2
 
 warning: Cannot convert the value in the spreadsheet cell C4 to format (F8.2): Field contents are not numeric.
 
@@ -114,11 +114,11 @@ LIST.
 AT_CHECK([pspp -o pspp.csv get-data.sps])
 AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Variables
-Name,Position,Print Format,Write Format,Missing Values
-vone,1,F8.2,F8.2,
-vtwo,2,F8.2,F8.2,
-vthree,3,A8,A8,
-v4,4,F8.2,F8.2,
+Name,Position,Print Format,Write Format
+vone,1,F8.2,F8.2
+vtwo,2,F8.2,F8.2
+vthree,3,A8,A8
+v4,4,F8.2,F8.2
 
 Table: Data List
 vone,vtwo,vthree,v4
@@ -403,6 +403,7 @@ AT_CHECK([cp $top_srcdir/tests/language/data-io/readnames.ods this.ods])dnl
 
 AT_DATA([readnames.sps],[dnl
 GET DATA /TYPE=ODS /FILE='this.ods' /CELLRANGE=RANGE 'A1:H8' /READNAMES=ON
+EXECUTE.
 DISPLAY DICTIONARY.
 LIST.
 ])
@@ -410,14 +411,14 @@ LIST.
 
 AT_CHECK([pspp -O format=csv readnames.sps], [0], [dnl
 Table: Variables
-Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
-freda,1,,Scale,Input,8,Right,F8.2,F8.2,
-fred,2,,Scale,Input,8,Right,F8.2,F8.2,
-fred_A,3,,Scale,Input,8,Right,F8.2,F8.2,
-fred_B,4,,Scale,Input,8,Right,F8.2,F8.2,
-fred_C,5,,Scale,Input,8,Right,F8.2,F8.2,
-fred_D,6,,Scale,Input,8,Right,F8.2,F8.2,
-fred_E,7,,Scale,Input,8,Right,F8.2,F8.2,
+Name,Position,Measurement Level,Role,Width,Alignment,Print Format,Write Format
+freda,1,Nominal,Input,8,Right,F8.2,F8.2
+fred,2,Nominal,Input,8,Right,F8.2,F8.2
+fred_A,3,Nominal,Input,8,Right,F8.2,F8.2
+fred_B,4,Nominal,Input,8,Right,F8.2,F8.2
+fred_C,5,Nominal,Input,8,Right,F8.2,F8.2
+fred_D,6,Nominal,Input,8,Right,F8.2,F8.2
+fred_E,7,Nominal,Input,8,Right,F8.2,F8.2
 
 Table: Data List
 freda,fred,fred_A,fred_B,fred_C,fred_D,fred_E