tests: Convert FILTER tests to use Autotest.

diff --git a/tests/automake.mk b/tests/automake.mk
index 61e75489fb7437db0529173259e4302b32f7e33f..297c21758f63b4044bb8832072b38bac92d29366 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/filter.sh \
        tests/command/get-data-txt.sh \
        tests/command/get-data-txt-examples.sh \
        tests/command/get-data-txt-importcases.sh \
@@ -407,6 +406,7 @@ TESTSUITE_AT = \
        tests/language/xforms/compute.at \
        tests/language/xforms/count.at \
        tests/language/xforms/recode.at \
+       tests/language/xforms/select-if.at \
        tests/libpspp/abt.at \
        tests/libpspp/bt.at \
        tests/libpspp/heap.at \

diff --git a/tests/command/filter.sh b/tests/command/filter.sh
deleted file mode 100755 (executable)
index df331da..0000000
--- a/tests/command/filter.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/sh
-
-# This program tests ....
-
-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
-
-
-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 notable /X 1-2.
-begin data.
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-end data.
-compute FILTER_$ = mod(x,2).
-
-filter by filter_$.
-list.
-filter off.
-list.
-compute filter_$ = 1 - filter_$.
-filter by filter_$.
-list.
-
-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 results"
-diff -c $TEMPDIR/pspp.csv - << EOF
-Table: Data List
-X,FILTER_$
-1,1.00
-3,1.00
-5,1.00
-7,1.00
-9,1.00
-
-Table: Data List
-X,FILTER_$
-1,1.00
-2,.00
-3,1.00
-4,.00
-5,1.00
-6,.00
-7,1.00
-8,.00
-9,1.00
-10,.00
-
-Table: Data List
-X,FILTER_$
-2,1.00
-4,1.00
-6,1.00
-8,1.00
-10,1.00
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-pass;

diff --git a/tests/language/xforms/select-if.at b/tests/language/xforms/select-if.at
new file mode 100644 (file)
index 0000000..44ac01d
--- /dev/null
+++ b/tests/language/xforms/select-if.at
@@ -0,0 +1,59 @@
+AT_BANNER([FILTER])
+
+AT_SETUP([FILTER])
+AT_DATA([filter.sps], [dnl
+data list notable /X 1-2.
+begin data.
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+end data.
+compute FILTER_$ = mod(x,2).
+
+filter by filter_$.
+list.
+filter off.
+list.
+compute filter_$ = 1 - filter_$.
+filter by filter_$.
+list.
+])
+AT_CHECK([pspp -o pspp.csv filter.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+Table: Data List
+X,FILTER_$
+1,1.00
+3,1.00
+5,1.00
+7,1.00
+9,1.00
+
+Table: Data List
+X,FILTER_$
+1,1.00
+2,.00
+3,1.00
+4,.00
+5,1.00
+6,.00
+7,1.00
+8,.00
+9,1.00
+10,.00
+
+Table: Data List
+X,FILTER_$
+2,1.00
+4,1.00
+6,1.00
+8,1.00
+10,1.00
+])
+AT_CLEANUP