X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdictionary%2Frename-variables.at;h=021698243c183697d35c73a2fe61c3fcca2dd071;hb=refs%2Fheads%2Fdev2;hp=f528dcb04692ef36c05c774584fc9decd41be0f9;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp

diff --git a/tests/language/dictionary/rename-variables.at b/tests/language/dictionary/rename-variables.at
index f528dcb046..021698243c 100644
--- a/tests/language/dictionary/rename-variables.at
+++ b/tests/language/dictionary/rename-variables.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([RENAME VARIABLES])
 
 AT_SETUP([RENAME VARIABLES])
@@ -19,8 +35,7 @@ LIST.
 
 SAVE /OUTFILE='rename.sav'.
 ])
-AT_CHECK([pspp -o pspp.csv rename-variables.sps])
-AT_CHECK([cat pspp.csv], [0], [dnl
+AT_CHECK([pspp -O format=csv rename-variables.sps], [0], [dnl
 Table: Reading free-form data from INLINE.
 Variable,Format
 brakeFluid,F2.0
@@ -45,11 +60,43 @@ applecarts,bananamobiles,xyzzy,foobar
 AT_CHECK([grep '[bB][rR][aA][kK][eE]' rename.sav], [1], [ignore-nolog])
 AT_CLEANUP
 
+
+AT_SETUP([RENAME VARIABLES -- multiple sets])
+AT_DATA([rename-variables.sps], [dnl
+data list list /a b c d  e *.
+begin data.
+1 2 3 4 5
+end data.
+
+rename variables (a b=x y) (c d e=z zz zzz).
+
+list.
+])
+
+AT_CHECK([pspp -O format=csv rename-variables.sps], [0], [dnl
+Table: Reading free-form data from INLINE.
+Variable,Format
+a,F8.0
+b,F8.0
+c,F8.0
+d,F8.0
+e,F8.0
+
+Table: Data List
+x,y,z,zz,zzz
+1.00,2.00,3.00,4.00,5.00
+])
+
+AT_CLEANUP
+
+
 AT_SETUP([RENAME VARIABLES -- invalid syntax 1])
+
 AT_DATA([rename-variables.sps], [dnl
 DATA LIST LIST /brakeFluid y auxiliary warp (F2.0).
 RENAME VARIABLES warp auxiliary=foobar xyzzy.
 ])
+
 AT_CHECK([pspp -o pspp.csv rename-variables.sps], [1], [dnl
 rename-variables.sps:2.23-2.31: error: RENAME VARIABLES: Syntax error at `auxiliary': expecting `='.
 ])
@@ -60,7 +107,28 @@ AT_DATA([rename-variables.sps], [dnl
 DATA LIST LIST /brakeFluid y auxiliary warp (F2.0).
 RENAME VARIABLES (brakeFluid=applecarts y=bananamobiles).
 ])
+
 AT_CHECK([pspp -o pspp.csv rename-variables.sps], [1], [dnl
 rename-variables.sps:2: error: RENAME VARIABLES: Differing number of variables in old name list (1) and in new name list (2).
 ])
 AT_CLEANUP
+
+
+
+
+AT_SETUP([RENAME VARIABLES -- invalid syntax 3])
+AT_DATA([rename-variables.sps], [dnl
+DATA LIST NOTABLE LIST /z y p q (F2.0).
+BEGIN DATA.
+4 3 8 11
+END DATA.
+
+RENAME VARIABLES z=a y}bqnanamobiles.
+
+LIST.
+])
+
+AT_CHECK([pspp -O format=csv rename-variables.sps], [1], [ignore])
+
+
+AT_CLEANUP