From 7a65a15152c71974da19c4045438b7c7b27109c2 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 25 Sep 2010 20:23:09 -0700 Subject: [PATCH] tests: Convert FILTER tests to use Autotest. --- tests/automake.mk | 2 +- tests/command/filter.sh | 126 ----------------------------- tests/language/xforms/select-if.at | 59 ++++++++++++++ 3 files changed, 60 insertions(+), 127 deletions(-) delete mode 100755 tests/command/filter.sh create mode 100644 tests/language/xforms/select-if.at diff --git a/tests/automake.mk b/tests/automake.mk index 61e75489..297c2175 100644 --- 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 index df331dab..00000000 --- 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 index 00000000..44ac01d4 --- /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 -- 2.30.2