RENAME VARIABLES: Convert tests to Autotest framework.

diff --git a/tests/automake.mk b/tests/automake.mk
index 72395adb4834eb749ed2a0fc5c3aadd304efa84b..bfd9b01026f8ad82d0d24d2a8929917798766193 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -10,7 +10,6 @@ TESTS_ENVIRONMENT += LC_ALL=C
 TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
 
 dist_TESTS = \
-       tests/command/rename.sh \
        tests/command/regression.sh \
        tests/command/regression-qr.sh \
        tests/command/reliability.sh \
@@ -365,6 +364,7 @@ TESTSUITE_AT = \
        tests/language/dictionary/attributes.at \
        tests/language/dictionary/missing-values.at \
        tests/language/dictionary/mrsets.at \
+       tests/language/dictionary/rename-variables.at \
        tests/language/expressions/evaluate.at \
        tests/language/lexer/variable-parser.at \
        tests/language/stats/aggregate.at \

diff --git a/tests/command/rename.sh b/tests/command/rename.sh
deleted file mode 100755 (executable)
index cc7a36b..0000000
--- a/tests/command/rename.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-# This program tests that the rename command works properly
-
-TEMPDIR=/tmp/pspp-tst-$$
-TESTFILE=$TEMPDIR/`basename $0`.sps
-
-# ensure that top_builddir  are absolute
-if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
-if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
-top_builddir=`cd $top_builddir; pwd`
-PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
-
-# ensure that top_srcdir is absolute
-top_srcdir=`cd $top_srcdir; pwd`
-
-STAT_CONFIG_PATH=$top_srcdir/config
-export STAT_CONFIG_PATH
-
-PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
-
-
-cleanup()
-{
-     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
-       echo "NOT cleaning $TEMPDIR" 
-       return ; 
-     fi
-     cd /
-     rm -rf $TEMPDIR
-}
-
-
-fail()
-{
-    echo $activity
-    echo FAILED
-    cleanup;
-    exit 1;
-}
-
-
-no_result()
-{
-    echo $activity
-    echo NO RESULT;
-    cleanup;
-    exit 2;
-}
-
-pass()
-{
-    cleanup;
-    exit 0;
-}
-
-mkdir -p $TEMPDIR
-
-cd $TEMPDIR
-
-activity="create program"
-cat > $TESTFILE <<EOF
-DATA LIST LIST /brakeFluid * y * .
-BEGIN DATA.
-1 3
-2 3
-3 3
-4 3
-END DATA.
-
-LIST.
-
-RENAME VARIABLES (brakeFluid=applecarts).
-
-LIST.
-
-SAVE /OUTFILE='$TEMPDIR/rename.sav'.
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-activity="run program"
-$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
-if [ $? -ne 0 ] ; then no_result ; fi
-
-activity="check sysfile"
-grep -i Brake $TEMPDIR/rename.sav
-if [ $? -eq 0 ] ; then fail ; fi
-
-activity="compare output"
-diff -c $TEMPDIR/pspp.csv - <<EOF
-Table: Reading free-form data from INLINE.
-Variable,Format
-brakeFluid,F8.0
-y,F8.0
-
-Table: Data List
-brakeFluid,y
-1.00,3.00
-2.00,3.00
-3.00,3.00
-4.00,3.00
-
-Table: Data List
-applecarts,y
-1.00,3.00
-2.00,3.00
-3.00,3.00
-4.00,3.00
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-pass

diff --git a/tests/language/dictionary/rename-variables.at b/tests/language/dictionary/rename-variables.at
new file mode 100644 (file)
index 0000000..d0f7632
--- /dev/null
+++ b/tests/language/dictionary/rename-variables.at
@@ -0,0 +1,43 @@
+AT_BANNER([RENAME VARIABLES])
+
+AT_SETUP([RENAME VARIABLES])
+AT_DATA([rename-variables.sps], [dnl
+DATA LIST LIST /brakeFluid * y * .
+BEGIN DATA.
+1 3
+2 3
+3 3
+4 3
+END DATA.
+
+LIST.
+
+RENAME VARIABLES (brakeFluid=applecarts).
+
+LIST.
+
+SAVE /OUTFILE='rename.sav'.
+])
+AT_CHECK([pspp -o pspp.csv rename-variables.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+Table: Reading free-form data from INLINE.
+Variable,Format
+brakeFluid,F8.0
+y,F8.0
+
+Table: Data List
+brakeFluid,y
+1.00,3.00
+2.00,3.00
+3.00,3.00
+4.00,3.00
+
+Table: Data List
+applecarts,y
+1.00,3.00
+2.00,3.00
+3.00,3.00
+4.00,3.00
+])
+AT_CHECK([grep '[bB][rR][aA][kK][eE]' rename.sav], [1], [ignore-nolog])
+AT_CLEANUP