output: Introduce pivot tables.

[pspp] / tests / language / dictionary / sys-file-info.at

diff --git a/tests/language/dictionary/sys-file-info.at b/tests/language/dictionary/sys-file-info.at
index ac8e8cd54a9de16f507cf6646418961d4aa3da2d..11f5d4e9f82c8ca0b6ea562a7512adfeab81a2ee 100644 (file)
--- a/tests/language/dictionary/sys-file-info.at
+++ b/tests/language/dictionary/sys-file-info.at
@@ -30,36 +30,30 @@ sysfile info file='pro.sav'.
 ])
 AT_CHECK([pspp -o pspp.csv sysfile-info.sps])
 AT_CHECK(
-  [sed -e '/^Created:,/d' \
-       -e '/^Endian:,/d' \
-       -e '/^Integer Format:,/d' \
-       -e '/^Real Format:,/d' \
-       -e '/^Encoding:,/d' pspp.csv],
+  [sed -e '/^Created,/d' \
+       -e '/^Endian,/d' \
+       -e '/^Integer Format,/d' \
+       -e '/^Real Format,/d' \
+       -e '/^Encoding,/d' pspp.csv],
   [0], [dnl
 Table: Reading free-form data from INLINE.
 Variable,Format
 x,F8.0
 name,A10
 
-File:,pro.sav
-Label:,No label.
-Variables:,2
-Cases:,3
-Type:,SPSS System File
-Weight:,Not weighted.
-Compression:,SAV
-
-Variable,Description,Position
-x,"Format: F8.2
-Measure: Scale
-Role: Input
-Display Alignment: Right
-Display Width: 8",1
-name,"Format: A10
-Measure: Nominal
-Role: Input
-Display Alignment: Left
-Display Width: 10",2
+Table: File Information
+File,pro.sav
+Label,
+Variables,2
+Cases,3
+Type,SPSS System File
+Weight,Not weighted
+Compression,SAV
+
+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,2,,Nominal,Input,10,Left,A10,A10,
 ])
 AT_CLEANUP
 
@@ -77,9 +71,11 @@ FILE LABEL 'foo bar baz quux'.
 DISPLAY FILE LABEL.
 ])
 AT_CHECK([pspp -O format=csv display.sps], [0], [dnl
-The active dataset does not have a file label.
+Table: File Label
+Label,(none)
 
-File label: foo bar baz quux
+Table: File Label
+Label,foo bar baz quux
 ])
 AT_CLEANUP
 
@@ -97,7 +93,8 @@ DISPLAY SCRATCH.
 AT_CHECK([pspp -O format=csv sysfile-info.sps], [0], [dnl
 sysfile-info.sps:2: warning: DISPLAY: No variables to display.
 
-Variable
+Table: Variables
+Name
 #x
 ])
 AT_CLEANUP
@@ -108,7 +105,8 @@ DATA LIST LIST NOTABLE /x * name (a10) .
 DISPLAY INDEX.
 ])
 AT_CHECK([pspp -O format=csv sysfile-info.sps], [0], [dnl
-Variable,Position
+Table: Variables
+Name,Position
 x,1
 name,2
 ])
@@ -120,7 +118,8 @@ DATA LIST LIST NOTABLE /x * name (a10) .
 DISPLAY NAMES.
 ])
 AT_CHECK([pspp -O format=csv sysfile-info.sps], [0], [dnl
-Variable
+Table: Variables
+Name
 x
 name
 ])
@@ -134,9 +133,10 @@ VALUE LABEL x 1 'asdf' 2 'jkl;'.
 DISPLAY LABELS.
 ])
 AT_CHECK([pspp -O format=csv sysfile-info.sps], [0], [dnl
-Variable,Label,Position
-x,variable one,1
-name,variable two,2
+Table: Variables
+Name,Position,Label
+x,1,variable one
+name,2,variable two
 ])
 AT_CLEANUP