From 65a73ff3836bd26f54ad9862959bef918a24b3fc Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 4 Oct 2010 12:49:05 -0700
Subject: [PATCH] tests: Convert REGRESSION tests to Autotest framework.

---
 tests/automake.mk                             |   3 +-
 tests/command/regression.sh                   | 123 -----------------
 .../stats/regression.at}                      | 128 +++++++++---------
 3 files changed, 63 insertions(+), 191 deletions(-)
 delete mode 100755 tests/command/regression.sh
 rename tests/{command/regression-qr.sh => language/stats/regression.at} (95%)
 mode change 100755 => 100644

diff --git a/tests/automake.mk b/tests/automake.mk
index bfd9b010..b6f45911 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -10,8 +10,6 @@ TESTS_ENVIRONMENT += LC_ALL=C
 TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
 
 dist_TESTS = \
-	tests/command/regression.sh \
-	tests/command/regression-qr.sh \
 	tests/command/reliability.sh \
 	tests/command/roc.sh \
 	tests/command/roc2.sh \
@@ -379,6 +377,7 @@ TESTSUITE_AT = \
 	tests/language/stats/npar.at \
 	tests/language/stats/oneway.at \
 	tests/language/stats/rank.at \
+	tests/language/stats/regression.at \
 	tests/language/utilities/insert.at \
 	tests/language/utilities/permissions.at \
 	tests/language/utilities/set.at \
diff --git a/tests/command/regression.sh b/tests/command/regression.sh
deleted file mode 100755
index 360115f2..00000000
--- a/tests/command/regression.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# This program tests that the REGRESSION command works.
-
-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 list / v0 to v2.
-begin data
- 0.65377128  7.735648 -23.97588
--0.13087553  6.142625 -19.63854
- 0.34880368  7.651430 -25.26557
- 0.69249021  6.125125 -16.57090
--0.07368178  8.245789 -25.80001
--0.34404919  6.031540 -17.56743
- 0.75981559  9.832291 -28.35977
--0.46958313  5.343832 -16.79548
--0.06108490  8.838262 -29.25689
- 0.56154863  6.200189 -18.58219
-end data
-regression /variables=v0 v1 v2 /statistics defaults /dependent=v2 /method=enter /save=pred resid.
-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
-
-diff -c $TEMPDIR/pspp.csv - << EOF
-Table: Reading free-form data from INLINE.
-Variable,Format
-v0,F8.0
-v1,F8.0
-v2,F8.0
-
-Table: Model Summary
-,R,R Square,Adjusted R Square,Std. Error of the Estimate
-,.97,.94,.93,1.34
-
-Table: ANOVA
-,,Sum of Squares,df,Mean Square,F,Significance
-,Regression,202.75,2,101.38,56.75,.00
-,Residual,12.50,7,1.79,,
-,Total,215.26,9,,,
-
-Table: Coefficients
-,,B,Std. Error,Beta,t,Significance
-,(Constant),2.19,2.36,.00,.93,.52
-,v0,1.81,1.05,.17,1.72,.12
-,v1,-3.43,.33,-1.03,-10.33,.00
-,,,,,,
-
-Table: Data List
-v0,v1,v2,RES1,PRED1
-.65,7.74,-23.98,-.84,-23.13
--.13,6.14,-19.64,-.54,-19.10
-.35,7.65,-25.27,-1.87,-23.40
-.69,6.13,-16.57,.97,-17.54
--.07,8.25,-25.80,.40,-26.20
--.34,6.03,-17.57,1.53,-19.10
-.76,9.83,-28.36,1.77,-30.13
--.47,5.34,-16.80,.18,-16.97
--.06,8.84,-29.26,-1.05,-28.21
-.56,6.20,-18.58,-.54,-18.04
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-pass
diff --git a/tests/command/regression-qr.sh b/tests/language/stats/regression.at
old mode 100755
new mode 100644
similarity index 95%
rename from tests/command/regression-qr.sh
rename to tests/language/stats/regression.at
index fd33cb80..11ce07fa
--- a/tests/command/regression-qr.sh
+++ b/tests/language/stats/regression.at
@@ -1,63 +1,66 @@
-#!/bin/sh
-
-# This program tests that the QR decomposition used by the REGRESSION command works.
-
-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;
-}
+AT_BANNER([REGRESSION])
 
+AT_SETUP([REGRESSION])
+AT_DATA([regression.sps], [dnl
+data list list / v0 to v2.
+begin data
+ 0.65377128  7.735648 -23.97588
+-0.13087553  6.142625 -19.63854
+ 0.34880368  7.651430 -25.26557
+ 0.69249021  6.125125 -16.57090
+-0.07368178  8.245789 -25.80001
+-0.34404919  6.031540 -17.56743
+ 0.75981559  9.832291 -28.35977
+-0.46958313  5.343832 -16.79548
+-0.06108490  8.838262 -29.25689
+ 0.56154863  6.200189 -18.58219
+end data
+regression /variables=v0 v1 v2 /statistics defaults /dependent=v2 /method=enter /save=pred resid.
+list.
+])
+AT_CHECK([pspp -o pspp.csv regression.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+Table: Reading free-form data from INLINE.
+Variable,Format
+v0,F8.0
+v1,F8.0
+v2,F8.0
 
-no_result()
-{
-    echo $activity
-    echo NO RESULT;
-    cleanup;
-    exit 2;
-}
+Table: Model Summary
+,R,R Square,Adjusted R Square,Std. Error of the Estimate
+,.97,.94,.93,1.34
 
-pass()
-{
-    cleanup;
-    exit 0;
-}
+Table: ANOVA
+,,Sum of Squares,df,Mean Square,F,Significance
+,Regression,202.75,2,101.38,56.75,.00
+,Residual,12.50,7,1.79,,
+,Total,215.26,9,,,
 
-mkdir -p $TEMPDIR
+Table: Coefficients
+,,B,Std. Error,Beta,t,Significance
+,(Constant),2.19,2.36,.00,.93,.52
+,v0,1.81,1.05,.17,1.72,.12
+,v1,-3.43,.33,-1.03,-10.33,.00
+,,,,,,
 
-cd $TEMPDIR
+Table: Data List
+v0,v1,v2,RES1,PRED1
+.65,7.74,-23.98,-.84,-23.13
+-.13,6.14,-19.64,-.54,-19.10
+.35,7.65,-25.27,-1.87,-23.40
+.69,6.13,-16.57,.97,-17.54
+-.07,8.25,-25.80,.40,-26.20
+-.34,6.03,-17.57,1.53,-19.10
+.76,9.83,-28.36,1.77,-30.13
+-.47,5.34,-16.80,.18,-16.97
+-.06,8.84,-29.26,-1.05,-28.21
+.56,6.20,-18.58,-.54,-18.04
+])
+AT_CLEANUP
 
-activity="create program"
-cat > $TESTFILE <<EOF
+# Tests the QR decomposition used by the REGRESSION command.
+AT_SETUP([REGRESSION test of QR decomposition])
+AT_DATA([regression.sps], [dnl
 data list list / v0 to v1.
 begin data
 -12.84099361 0.873270778
@@ -1562,14 +1565,9 @@ begin data
  -2.46291902 0.390902746
 end data
 regression /variables=v0 v1 /statistics defaults /dependent=v0 /method=enter.
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-activity="run program"
-$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
-if [ $? -ne 0 ] ; then no_result ; fi
-
-diff -c $TEMPDIR/pspp.csv - << EOF
+])
+AT_CHECK([pspp -o pspp.csv regression.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Reading free-form data from INLINE.
 Variable,Format
 v0,F8.0
@@ -1590,7 +1588,5 @@ Table: Coefficients
 ,(Constant),1.24,.42,.00,2.95,.21
 ,v1,1.37,.72,.05,1.89,.06
 ,,,,,,
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-pass
+])
+AT_CLEANUP
-- 
2.30.2