From 973fb7a1cd984715bc5e1f46a8b8922e5a5f6fd7 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 4 Oct 2010 11:25:25 -0700
Subject: [PATCH] RANK: Convert tests to Autotest framework.

---
 tests/automake.mk                             |   2 +-
 .../rank.sh => language/stats/rank.at}        | 711 ++++++++----------
 2 files changed, 315 insertions(+), 398 deletions(-)
 rename tests/{command/rank.sh => language/stats/rank.at} (59%)
 mode change 100755 => 100644

diff --git a/tests/automake.mk b/tests/automake.mk
index ad83e1c8..72395adb 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/rank.sh \
 	tests/command/rename.sh \
 	tests/command/regression.sh \
 	tests/command/regression-qr.sh \
@@ -379,6 +378,7 @@ TESTSUITE_AT = \
 	tests/language/stats/frequencies.at \
 	tests/language/stats/npar.at \
 	tests/language/stats/oneway.at \
+	tests/language/stats/rank.at \
 	tests/language/utilities/insert.at \
 	tests/language/utilities/permissions.at \
 	tests/language/utilities/set.at \
diff --git a/tests/command/rank.sh b/tests/language/stats/rank.at
old mode 100755
new mode 100644
similarity index 59%
rename from tests/command/rank.sh
rename to tests/language/stats/rank.at
index 62677882..ac44189c
--- a/tests/command/rank.sh
+++ b/tests/language/stats/rank.at
@@ -1,153 +1,7 @@
-#!/bin/sh
+AT_BANNER([RANK])
 
-# This program tests the RANK command.
-
-TEMPDIR=/tmp/pspp-tst-$$
-TESTFILE=$TEMPDIR/`basename $0`.sps
-
-# ensure that top_srcdir and top_builddir  are absolute
-if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
-if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
-top_srcdir=`cd $top_srcdir; pwd`
-top_builddir=`cd $top_builddir; pwd`
-
-PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
-
-STAT_CONFIG_PATH=$top_srcdir/config
-export STAT_CONFIG_PATH
-
-LANG=C
-export LANG
-
-
-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
-
-
-# Some tests for proper behaviour in the face of invalid input.
-activity="create file 1"
-cat > $TESTFILE <<EOF
-DATA LIST LIST NOTABLE /x * a (a2).
-BEGIN DATA.
--1 s
-0  s
-1  s
-2  s
-2  s
-4  s
-5  s
-END DATA.
-
-DEBUG XFORM FAIL.
-
-RANK x.
-
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-# Check that it properly handles failed transformations.
-activity="run program 1"
-$SUPERVISOR $PSPP --testing-mode -o pspp.csv -e $TEMPDIR/err $TESTFILE 
-if [ $? -ne 1 ] ; then fail ; fi
-
-activity="diff 1"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/err
-diff  -b $TEMPDIR/err - <<EOF
-$TEMPDIR/rank.sh.sps:14: error: Stopping syntax file processing here to avoid a cascade of dependent command failures.
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-#Now for some general error conditions.
-activity="create file 2"
-cat > $TESTFILE <<EOF
-DATA LIST LIST NOTABLE /x * a (a2).
-BEGIN DATA.
--1 s
-0  s
-1  s
-2  s
-2  s
-4  s
-5  s
-END DATA.
-
-* invalid NTILES (no parameter)
-RANK x 
-  /NTILES
-.
-
-* invalid NTILES (not an integer)
-RANK x 
-  /NTILES(d)
-.
-
-
-* destination variable already exists
-RANK x 
- /RANK INTO x.
-
-
-* Too many variables in INTO
-RANK x 
- /RANK INTO foo  bar wiz.
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-activity="run program (syntax errors)"
-$SUPERVISOR $PSPP -o pspp.csv -e $TEMPDIR/errs $TESTFILE 
-if [ $? -ne 1 ] ; then fail ; fi
-
-activity="compare errors"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/errs
-diff -b $TEMPDIR/errs - << EOF
-$TEMPDIR/rank.sh.sps:15: error: RANK: Syntax error at end of command:  expecting \`('.
-$TEMPDIR/rank.sh.sps:19: error: RANK: Syntax error at \`d':  expecting integer.
-$TEMPDIR/rank.sh.sps:25: error: RANK: Variable x already exists.
-$TEMPDIR/rank.sh.sps:30: error: RANK: Too many variables in INTO clause.
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-# Now some real tests.
-
-activity="create file 3"
-cat > $TESTFILE <<EOF
+AT_SETUP([RANK simple case with defaults])
+AT_DATA([rank.sps], [dnl
 DATA LIST LIST NOTABLE /x (f8).
 BEGIN DATA.
 -1
@@ -159,13 +13,32 @@ BEGIN DATA.
 5 
 END DATA.
 
-ECHO  'Simple example using defaults'.
-
 RANK x.
 
 LIST.
+])
+AT_CHECK([pspp -o pspp.csv rank.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+Variables Created By RANK
+
+
+
+x into Rx(RANK of x)
+
+Table: Data List
+x,Rx
+-1,1.000
+0,2.000
+1,3.000
+2,4.500
+2,4.500
+4,6.000
+5,7.000
+])
+AT_CLEANUP
 
-NEW FILE.
+AT_SETUP([RANK with RANK, RFRACTION, N])
+AT_DATA([rank.sps], [dnl
 DATA LIST LIST NOTABLE /a * b *.
 BEGIN DATA.
 0 24
@@ -191,198 +64,9 @@ RANK a b (D)
 DISPLAY DICTIONARY.
 
 LIST.
-
-
-ECHO  'Test variable name fallback'.
-
-NEW FILE.
-DATA LIST LIST NOTABLE /foo * rfoo * ran003 *.
-BEGIN DATA.
-0 3 2
-1 3 2
-2 3 2
-2 3 2
-4 3 2
-5 3 2
-6 3 2
-7 3 2
-8 3 2
-9 3 2
-END DATA.
-
-RANK foo.
-
-
-DISPLAY DICTIONARY.
-
-
-NEW FILE.
-DATA LIST LIST NOTABLE /a * b *.
-BEGIN DATA.
-0 24
-1 32
-2 31
-2 32
-4 30
-5 29
-6 1
-7 43
-8 8 
-9 45
-END DATA.
-
-RANK a
-  /PRINT=YES
-  /TIES=CONDENSE
-  /SAVAGE
-  /PERCENT
-  /PROPORTION
-  /NTILES(4)
-  /NORMAL
-.
-
-LIST.
-
-NEW FILE.
-DATA LIST LIST NOTABLE /a * g1 g2 *.
-BEGIN DATA.
-2 1 2
-2 1 2
-3 1 2
-4 1 2
-5 1 2
-1 0 2
-2 0 2
-3 0 2
-4 0 2
-5 0 2
-6 0 2
-7 0 2
-8 0 2
-6 1 2
-7 1 2
-7 1 2
-8 1 2
-9 1 1
-END DATA.
-
-RANK a (D) BY g2 g1
-  /PRINT=YES
-  /TIES=LOW
-  /MISSING=INCLUDE
-  /FRACTION=RANKIT
-  /RANK
-  /NORMAL
-  .
-
-SPLIT FILE BY g1.
-
-RANK a (D) BY g2
-  /PRINT=YES
-  /TIES=LOW
-  /MISSING=INCLUDE
-  /FRACTION=RANKIT
-  /RANK
-  /NORMAL
-  .
-
-SPLIT FILE OFF.
-
-LIST.
-
-
-ECHO 'fractional ranks ( including small ones for special case of SAVAGE ranks)'
-NEW FILE.
-DATA LIST LIST NOTABLE  /a *  w * .
-BEGIN DATA.
-1 1.5
-2 0.2
-3 0.1
-4 1
-5 1
-6 1
-7 1
-8 1
-END DATA.
-
-WEIGHT BY w.
-
-RANK a 
-  /FRACTION=TUKEY
-  /PROPORTION
-  /SAVAGE
-.
-
-LIST.
-
-
-ECHO 'test all the ties cases with low caseweight values'.
-
-NEW FILE.
-DATA LIST LIST NOTABLE /x * w *.
-BEGIN DATA.
-1 0.1
-2 0.1
-3 0.1
-4 0.2
-5 0.1
-6 0.1
-7 0.1
-8 0.1
-END DATA.
-
-WEIGHT BY w.
-
-RANK x
- /TIES=low
- /RANK into xl.
-
-
-RANK x
- /TIES=high
- /RANK into xh.
-
-RANK x
- /TIES=condense
- /RANK into xc.
-
-
-* Test VW fraction
-
-RANK x
- /FRACTION=VW
- /NORMAL.
-
-LIST.
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-activity="run program 3"
-$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-activity="compare output 3"
-diff -c $TEMPDIR/pspp.csv - <<EOF
-Simple example using defaults
-
-Variables Created By RANK
-
-
-
-x into Rx(RANK of x)
-
-Table: Data List
-x,Rx
--1,1.000
-0,2.000
-1,3.000
-2,4.500
-2,4.500
-4,6.000
-5,7.000
-
+])
+AT_CHECK([pspp -o pspp.csv rank.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Variables Created By RANK
 
 
@@ -451,34 +135,39 @@ a,b,count,Ra,Rb,RFR001,RFR002,Nb
 7.00,43.00,10,3.000,2.000,.3000,.2222,9
 8.00,.  ,10,2.000,.   ,.2000,.    ,.
 9.00,45.00,10,1.000,1.000,.1000,.1111,9
+])
+AT_CLEANUP
 
-Test variable name fallback
-
-Variables Created By RANK
-
-
-
-foo into RAN001(RANK of foo)
+AT_SETUP([RANK with SAVAGE, PERCENT, PROPORTION, NTILES])
+AT_DATA([rank.sps], [dnl
+DATA LIST LIST NOTABLE /a * b *.
+BEGIN DATA.
+0 24
+1 32
+2 31
+2 32
+4 30
+5 29
+6 1
+7 43
+8 8 
+9 45
+END DATA.
 
-Variable,Description,,Position
-foo,Format: F8.2,,1
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-rfoo,Format: F8.2,,2
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-ran003,Format: F8.2,,3
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
-RAN001,RANK of foo,,4
-,Format: F9.3,,
-,Measure: Scale,,
-,Display Alignment: Right,,
-,Display Width: 8,,
+RANK a
+  /PRINT=YES
+  /TIES=CONDENSE
+  /SAVAGE
+  /PERCENT
+  /PROPORTION
+  /NTILES(4)
+  /NORMAL
+.
 
+LIST.
+])
+AT_CHECK([pspp -o pspp.csv rank.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Variables Created By RANK
 
 
@@ -505,7 +194,59 @@ a,b,Sa,Pa,PRO001,Na,NOR001
 7.00,43.00,.4290,70.00,.6463,3,.3755
 8.00,8.00,.9290,80.00,.7439,3,.6554
 9.00,45.00,1.9290,90.00,.8415,4,1.0005
+])
+AT_CLEANUP
 
+AT_SETUP([RANK with SPLIT FILE])
+AT_DATA([rank.sps], [dnl
+DATA LIST LIST NOTABLE /a * g1 g2 *.
+BEGIN DATA.
+2 1 2
+2 1 2
+3 1 2
+4 1 2
+5 1 2
+1 0 2
+2 0 2
+3 0 2
+4 0 2
+5 0 2
+6 0 2
+7 0 2
+8 0 2
+6 1 2
+7 1 2
+7 1 2
+8 1 2
+9 1 1
+END DATA.
+
+RANK a (D) BY g2 g1
+  /PRINT=YES
+  /TIES=LOW
+  /MISSING=INCLUDE
+  /FRACTION=RANKIT
+  /RANK
+  /NORMAL
+  .
+
+SPLIT FILE BY g1.
+
+RANK a (D) BY g2
+  /PRINT=YES
+  /TIES=LOW
+  /MISSING=INCLUDE
+  /FRACTION=RANKIT
+  /RANK
+  /NORMAL
+  .
+
+SPLIT FILE OFF.
+
+LIST.
+])
+AT_CHECK([pspp -o pspp.csv rank.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Variables Created By RANK
 
 
@@ -542,9 +283,36 @@ a,g1,g2,Ra,Na,RAN001,NOR001
 7.00,1.00,2.00,2.000,-.9674,2.000,-.3186
 8.00,1.00,2.00,1.000,-1.593,1.000,-1.150
 9.00,1.00,1.00,1.000,.0000,1.000,.0000
+])
+AT_CLEANUP
 
-fractional ranks ( including small ones for special case of SAVAGE ranks)
+# Also tests small ranks for special case of SAVAGE ranks.
+AT_SETUP([RANK with fractional ranks]) 
+AT_DATA([rank.sps], [dnl
+DATA LIST LIST NOTABLE  /a *  w * .
+BEGIN DATA.
+1 1.5
+2 0.2
+3 0.1
+4 1
+5 1
+6 1
+7 1
+8 1
+END DATA.
 
+WEIGHT BY w.
+
+RANK a 
+  /FRACTION=TUKEY
+  /PROPORTION
+  /SAVAGE
+.
+
+LIST.
+])
+AT_CHECK([pspp -o pspp.csv rank.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Variables Created By RANK
 
 
@@ -563,9 +331,49 @@ a,w,Pa,Sa
 6.00,1.00,.6262,.0262
 7.00,1.00,.7664,.4929
 8.00,1.00,.9065,1.3929
+])
+AT_CLEANUP
 
-test all the ties cases with low caseweight values
+AT_SETUP([RANK all-ties due to tiny weights])
+AT_DATA([rank.sps], [dnl
+DATA LIST LIST NOTABLE /x * w *.
+BEGIN DATA.
+1 0.1
+2 0.1
+3 0.1
+4 0.2
+5 0.1
+6 0.1
+7 0.1
+8 0.1
+END DATA.
+
+WEIGHT BY w.
+
+RANK x
+ /TIES=low
+ /RANK into xl.
+
+
+RANK x
+ /TIES=high
+ /RANK into xh.
+
+RANK x
+ /TIES=condense
+ /RANK into xc.
+
+
+* Test VW fraction
+
+RANK x
+ /FRACTION=VW
+ /NORMAL.
 
+LIST.
+])
+AT_CHECK([pspp -o pspp.csv rank.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Variables Created By RANK
 
 
@@ -600,14 +408,61 @@ x,w,xl,xh,xc,Nx
 6.00,.10,.600,.700,6.000,-.4067
 7.00,.10,.700,.800,7.000,-.2670
 8.00,.10,.800,.900,8.000,-.1323
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
+])
+AT_CLEANUP
+
+AT_SETUP([RANK variable name fallback])
+AT_DATA([rank.sps], [dnl
+DATA LIST LIST NOTABLE /foo * rfoo * ran003 *.
+BEGIN DATA.
+0 3 2
+1 3 2
+2 3 2
+2 3 2
+4 3 2
+5 3 2
+6 3 2
+7 3 2
+8 3 2
+9 3 2
+END DATA.
+
+RANK foo.
+
+
+DISPLAY DICTIONARY.
+])
+AT_CHECK([pspp -o pspp.csv rank.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+Variables Created By RANK
+
 
 
+foo into RAN001(RANK of foo)
+
+Variable,Description,,Position
+foo,Format: F8.2,,1
+,Measure: Scale,,
+,Display Alignment: Right,,
+,Display Width: 8,,
+rfoo,Format: F8.2,,2
+,Measure: Scale,,
+,Display Alignment: Right,,
+,Display Width: 8,,
+ran003,Format: F8.2,,3
+,Measure: Scale,,
+,Display Alignment: Right,,
+,Display Width: 8,,
+RAN001,RANK of foo,,4
+,Format: F9.3,,
+,Measure: Scale,,
+,Display Alignment: Right,,
+,Display Width: 8,,
+])
+AT_CLEANUP
 
-# A test to make sure that variable name creation is really robust
-activity="create file 4"
-cat > $TESTFILE <<EOF
+AT_SETUP([RANK robust variable name creation])
+AT_DATA([rank.sps], [dnl
 DATA LIST LIST notable /x * rx * ran001 TO ran999.
 BEGIN DATA.
 1
@@ -624,30 +479,21 @@ RANK x.
 DELETE VAR ran001 TO ran999.
 
 LIST.
+])
+AT_CHECK([pspp -O format=csv rank.sps], [0], [dnl
+"rank.sps:3: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
 
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-activity="run program 4"
-$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE 
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-activity="compare output 4"
-diff -c $TEMPDIR/pspp.csv - << EOF
-"$TEMPDIR/rank.sh.sps:3: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
+"rank.sps:4: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
 
-"$TEMPDIR/rank.sh.sps:4: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
+"rank.sps:5: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
 
-"$TEMPDIR/rank.sh.sps:5: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
+"rank.sps:6: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
 
-"$TEMPDIR/rank.sh.sps:6: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
+"rank.sps:7: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
 
-"$TEMPDIR/rank.sh.sps:7: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
+"rank.sps:8: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
 
-"$TEMPDIR/rank.sh.sps:8: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
-
-"$TEMPDIR/rank.sh.sps:9: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
+"rank.sps:9: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate."
 
 Variables Created By RANK
 
@@ -664,7 +510,78 @@ x,rx,RNKRA01
 5.00,.  ,5.000
 6.00,.  ,6.000
 7.00,.  ,7.000
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
+])
+AT_CLEANUP
+
+dnl Test for proper behaviour in the face of invalid input.
+AT_SETUP([RANK handling of invalid input])
+AT_DATA([rank.sps], [dnl
+DATA LIST LIST NOTABLE /x * a (a2).
+BEGIN DATA.
+-1 s
+0  s
+1  s
+2  s
+2  s
+4  s
+5  s
+END DATA.
+
+DEBUG XFORM FAIL.
+
+RANK x.
+])
+AT_CHECK([pspp -O format=csv --testing-mode rank.sps], [1], [dnl
+Variables Created By RANK
+
+
+
+x into Rx(RANK of x)
+
+rank.sps:14: error: Stopping syntax file processing here to avoid a cascade of dependent command failures.
+])
+AT_CLEANUP
+
+AT_SETUP([RANK handling of invalid syntax])
+AT_DATA([rank.sps], [dnl
+DATA LIST LIST NOTABLE /x * a (a2).
+BEGIN DATA.
+-1 s
+0  s
+1  s
+2  s
+2  s
+4  s
+5  s
+END DATA.
+
+* invalid NTILES (no parameter)
+RANK x 
+  /NTILES
+.
+
+* invalid NTILES (not an integer)
+RANK x 
+  /NTILES(d)
+.
+
+
+* destination variable already exists
+RANK x 
+ /RANK INTO x.
+
+
+* Too many variables in INTO
+RANK x 
+ /RANK INTO foo  bar wiz.
+])
+AT_CHECK([pspp -O format=csv rank.sps], [1], [dnl
+rank.sps:15: error: RANK: Syntax error at end of command: expecting `@{:@'.
+
+rank.sps:19: error: RANK: Syntax error at `d': expecting integer.
+
+rank.sps:25: error: RANK: Variable x already exists.
 
-pass;
+rank.sps:30: error: RANK: Too many variables in INTO clause.
+])
+AT_CLEANUP
-- 
2.30.2