X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdata-io%2Fget-data-spreadsheet.at;h=f739ca7168f41971a4a78ed0cb89aeaff7624a01;hb=d86cce86d3f0ac665de30543d18aea23653d3f94;hp=eca194a02dde0508735b318a1191a7ebc675fd54;hpb=6ee30c166727634ef579354e29eff96f70675418;p=pspp diff --git a/tests/language/data-io/get-data-spreadsheet.at b/tests/language/data-io/get-data-spreadsheet.at index eca194a02d..f739ca7168 100644 --- a/tests/language/data-io/get-data-spreadsheet.at +++ b/tests/language/data-io/get-data-spreadsheet.at @@ -1,19 +1,19 @@ 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 . -dnl +dnl m4_define([SPREADSHEET_TEST_PREP],[dnl m4_if($1,[GNM],[dnl AT_CHECK([gzip -c $top_srcdir/tests/language/data-io/Book1.gnm.unzipped > Book1.gnumeric])dnl @@ -36,18 +36,19 @@ LIST. ]) AT_CHECK([pspp -o pspp.csv get-data.sps]) AT_CHECK([cat pspp.csv], [0], [dnl -Variable,Description,Position -VAR001,Format: F8.2,1 -VAR002,Format: A8,2 -VAR003,Format: F8.2,3 +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, Table: Data List VAR001,VAR002,VAR003 -.00,fred ,20.00 -1.00,11 ,21.00 -2.00,twelve ,22.00 -3.00,13 ,23.00 -4.00,14 ,24.00 +.00,fred,20.00 +1.00,11,21.00 +2.00,twelve,22.00 +3.00,13,23.00 +4.00,14,24.00 ]) AT_CLEANUP @@ -60,18 +61,19 @@ LIST. ]) AT_CHECK([pspp -o pspp.csv get-data.sps]) AT_CHECK([cat pspp.csv], [0], [dnl -Variable,Description,Position -V1,Format: F8.2,1 -V2,Format: A8,2 -VAR001,Format: F8.2,3 +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, Table: Data List V1,V2,VAR001 -.00,fred ,20.00 -1.00,11 ,21.00 -2.00,twelve ,22.00 -3.00,13 ,23.00 -4.00,14 ,24.00 +.00,fred,20.00 +1.00,11,21.00 +2.00,twelve,22.00 +3.00,13,23.00 +4.00,14,24.00 ]) AT_CLEANUP @@ -83,19 +85,20 @@ DISPLAY VARIABLES. LIST. ]) AT_CHECK([pspp -O format=csv get-data.sps], [0], [dnl -Variable,Description,Position -name,Format: A8,1 -id,Format: F8.2,2 -height,Format: F8.2,3 +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, warning: Cannot convert the value in the spreadsheet cell C4 to format (F8.2): Field contents are not numeric. Table: Data List name,id,height -fred ,.00,23.40 -bert ,1.00,.56 -charlie ,2.00,. @&t@ -dick ,3.00,-34.09 +fred,.00,23.40 +bert,1.00,.56 +charlie,2.00,. @&t@ +dick,3.00,-34.09 ]) AT_CLEANUP @@ -109,11 +112,12 @@ LIST. ]) AT_CHECK([pspp -o pspp.csv get-data.sps]) AT_CHECK([cat pspp.csv], [0], [dnl -Variable,Description,Position -vone,Format: F8.2,1 -vtwo,Format: F8.2,2 -vthree,Format: A8,3 -v4,Format: F8.2,4 +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, Table: Data List vone,vtwo,vthree,v4 @@ -292,7 +296,7 @@ AT_DATA([minimal3.gnumeric],[dnl ]) AT_DATA([gnum.sps], [dnl -GET DATA +GET DATA /TYPE=GNM /FILE='minimal3.gnumeric' /SHEET=index 3 @@ -305,9 +309,9 @@ LIST. AT_CHECK([pspp -O format=csv gnum.sps], [0], [dnl Table: Data List VAR001,VAR002,VAR003 -3 ,4.00,5.00 -6 ,7.00,8.00 -9 ,10.00,11.00 +3,4.00,5.00 +6,7.00,8.00 +9,10.00,11.00 ]) @@ -317,9 +321,9 @@ AT_CLEANUP dnl Check for a bug where certain gnumeric files failed an assertion AT_SETUP([GET DATA /TYPE=GNM assert-fail]) AT_DATA([read.sps],[dnl -GET DATA +GET DATA /TYPE=GNM - /FILE='crash.gnumeric' + /FILE='crash.gnumeric' . list. ]) @@ -373,7 +377,7 @@ CHECK_SPREADSHEET_READER([ODS]) AT_SETUP([GET DATA /TYPE=ODS crash]) - + AT_CHECK([cp $top_srcdir/tests/language/data-io/newone.ods this.ods])dnl AT_DATA([crash.sps],[dnl @@ -399,15 +403,16 @@ LIST. ]) -AT_CHECK([pspp -O format=csv readnames.sps], [0], -[Variable,Description,Position -freda,Format: F8.2,1 -fred,Format: F8.2,2 -fred_A,Format: F8.2,3 -fred_B,Format: F8.2,4 -fred_C,Format: F8.2,5 -fred_D,Format: F8.2,6 -fred_E,Format: F8.2,7 +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, Table: Data List freda,fred,fred_A,fred_B,fred_C,fred_D,fred_E