X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=tests%2Fdata%2Fpor-file.at;h=fb73a50ee20bb094c8854de9e0920153e2e78135;hb=591bdbcf101c4d28cee791cc2444c414e460f7be;hp=1cc51fc1d6800b2c52ace34dade19e6550c43e26;hpb=63c7521729b947ace9e192dff9330813ecfb5812;p=pspp

diff --git a/tests/data/por-file.at b/tests/data/por-file.at
index 1cc51fc1d6..fb73a50ee2 100644
--- a/tests/data/por-file.at
+++ b/tests/data/por-file.at
@@ -1,3 +1,19 @@
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+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 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 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
 AT_BANNER([portable files])
 
 AT_SETUP([overwriting portable file])
@@ -84,31 +100,26 @@ EXPORT OUTFILE='data.por'.
 AT_CHECK([pspp -O format=csv export.sps])
 AT_DATA([import.sps], [dnl
 IMPORT FILE='data.por'.
+EXECUTE.
 DISPLAY DICTIONARY.
 LIST.
 ])
 AT_CHECK([pspp -O format=csv import.sps], [0], [dnl
-Variable,Description,Position
-VAR1,"Format: F1.0
-
-Value,Label
-1,one",1
-VAR2,"Format: F1.0
-
-Value,Label
-2,two",2
-VAR3,"Format: F1.0
-
-Value,Label
-3,three",3
-VAR4,"Format: F1.0
-
-Value,Label
-4,four",4
-VAR5,"Format: F1.0
-
-Value,Label
-5,five",5
+Table: Variables
+Name,Position,Measurement Level,Role,Width,Alignment,Print Format,Write Format
+VAR1,1,Nominal,Input,8,Right,F1.0,F1.0
+VAR2,2,Nominal,Input,8,Right,F1.0,F1.0
+VAR3,3,Nominal,Input,8,Right,F1.0,F1.0
+VAR4,4,Nominal,Input,8,Right,F1.0,F1.0
+VAR5,5,Nominal,Input,8,Right,F1.0,F1.0
+
+Table: Value Labels
+Variable Value,,Label
+VAR1,1,one
+VAR2,2,two
+VAR3,3,three
+VAR4,4,four
+VAR5,5,five
 
 Table: Data List
 VAR1,VAR2,VAR3,VAR4,VAR5
@@ -120,56 +131,30 @@ AT_CHECK([pspp -O format=csv sys-file-info.sps | sed '/Encoding/d
 /Integer Format/d
 /Real Format/d
 /Created/d
+/Product/d
 '], [0], [dnl
-File:,data.por
-Label:,No label.
-Product:,x86_64-unknown-linux-gnu
-Variables:,5
-Cases:,Unknown
-Type:,SPSS Portable File
-Weight:,Not weighted.
-Compression:,None
-
-Variable,Description,Position
-VAR1,"Format: F1.0
-Measure: Scale
-Role: Input
-Display Alignment: Right
-Display Width: 8
-
-Value,Label
-1,one",1
-VAR2,"Format: F1.0
-Measure: Scale
-Role: Input
-Display Alignment: Right
-Display Width: 8
-
-Value,Label
-2,two",2
-VAR3,"Format: F1.0
-Measure: Scale
-Role: Input
-Display Alignment: Right
-Display Width: 8
-
-Value,Label
-3,three",3
-VAR4,"Format: F1.0
-Measure: Scale
-Role: Input
-Display Alignment: Right
-Display Width: 8
-
-Value,Label
-4,four",4
-VAR5,"Format: F1.0
-Measure: Scale
-Role: Input
-Display Alignment: Right
-Display Width: 8
-
-Value,Label
-5,five",5
+Table: File Information
+File,data.por
+Variables,5
+Cases,Unknown
+Type,SPSS Portable File
+Weight,Not weighted
+Compression,None
+
+Table: Variables
+Name,Position,Measurement Level,Role,Width,Alignment,Print Format,Write Format
+VAR1,1,Unknown,Input,8,Right,F1.0,F1.0
+VAR2,2,Unknown,Input,8,Right,F1.0,F1.0
+VAR3,3,Unknown,Input,8,Right,F1.0,F1.0
+VAR4,4,Unknown,Input,8,Right,F1.0,F1.0
+VAR5,5,Unknown,Input,8,Right,F1.0,F1.0
+
+Table: Value Labels
+Variable Value,,Label
+VAR1,1,one
+VAR2,2,two
+VAR3,3,three
+VAR4,4,four
+VAR5,5,five
 ])
 AT_CLEANUP