X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Foneway.sh;h=5de916748dcc3df0e52af83a40d54e083ffc5d02;hb=b08603f631a2d998d8c604692fdf13669bb5e510;hp=193ab64774e9bbb4f61e6e55ced3574551fdfe07;hpb=93d02d0e1501d20706bd914e358e114c985fc9a3;p=pspp

diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index 193ab64774..5de916748d 100755
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.sh
@@ -3,18 +3,25 @@
 # This program tests that the ONEWAY anova command works OK
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
 # ensure that top_srcdir is absolute
 cd $top_srcdir; top_srcdir=`pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
-     rm -rf $TEMPDIR
+    if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo Not cleaning $TEMPDIR;
+	return ; 
+    fi
+    cd /
+    rm -rf $TEMPDIR
 }
 
 
@@ -46,26 +53,104 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
-data list list /id * cables * price *.
-begin data.
-1 2.0 3.0
-2 1.0 2.0
-3 2.0 4.5
-4 2.0 4.5
-5 3.0 6.0
-end data.
-
-ONEWAY 
- id cables BY price
- /STATISTICS descriptives homogeneity
- /MISSING analysis .
+cat > $TESTFILE <<EOF
+DATA LIST LIST /QUALITY * BRAND * .
+BEGIN DATA
+3 1
+2 1
+1 1
+1 1
+4 1
+5 2
+2 2
+4 2
+2 2
+3 2
+7  3
+4  3
+5  3
+3  3
+6  3
+END DATA
+
+VARIABLE LABELS brand 'Manufacturer'.
+VARIABLE LABELS quality 'Breaking Strain'.
+
+VALUE LABELS /brand 1 'Aspeger' 2 'Bloggs' 3 'Charlies'.
+
+ONEWAY
+	quality BY brand
+	/STATISTICS descriptives homogeneity
+	/CONTRAST =  -2 1 1 
+	/CONTRAST = 0 -1 1
+	.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+1.1 DATA LIST.  Reading free-form data from the command file.
++--------+------+
+|Variable|Format|
+#========#======#
+|QUALITY |F8.0  |
+|BRAND   |F8.0  |
++--------+------+
+
+2.1 ONEWAY.  Descriptives
+#===============#========#==#====#==============#==========#=======================#=======#=======#
+#               |        #  |    |              |          |    95% Confidence     |       |       #
+#               |        #  |    |              |          +-----------+-----------+       |       #
+#               |        # N|Mean|Std. Deviation|Std. Error|Lower Bound|Upper Bound|Minimum|Maximum#
+#===============#========#==#====#==============#==========#===========#===========#=======#=======#
+#Breaking Strain|Aspeger # 5|2.20|          1.30|       .58|        .58|       3.82|   1.00|   4.00#
+#               |Bloggs  # 5|3.20|          1.30|       .58|       1.58|       4.82|   2.00|   5.00#
+#               |Charlies# 5|5.00|          1.58|       .71|       3.04|       6.96|   3.00|   7.00#
+#               |Total   #15|3.47|          1.77|       .46|       2.49|       4.45|   1.00|   7.00#
+#===============#========#==#====#==============#==========#===========#===========#=======#=======#
+
+2.2 ONEWAY.  Test of Homogeneity of Variances
+#===============#================#===#===#============#
+#               #Levene Statistic|df1|df2|Significance#
+#===============#================#===#===#============#
+#Breaking Strain#            .092|  2| 12|        .913#
+#===============#================#===#===#============#
+
+2.3 ONEWAY.  ANOVA
+#==============================#==============#==#===========#=====#============#
+#                              #Sum of Squares|df|Mean Square|  F  |Significance#
+#===============#==============#==============#==#===========#=====#============#
+#Breaking Strain|Between Groups#         20.13| 2|     10.067|5.119|        .025#
+#               |Within Groups #         23.60|12|      1.967|     |            #
+#               |Total         #         43.73|14|           |     |            #
+#===============#==============#==============#==#===========#=====#============#
+
+2.4 ONEWAY.  Contrast Coefficients
+#==========#=======================#
+#          #      Manufacturer     #
+#          #-------+------+--------#
+#          #Aspeger|Bloggs|Charlies#
+#========#=#=======#======#========#
+#Contrast|1#     -2|     1|       1#
+#        |2#      0|    -1|       1#
+#========#=#=======#======#========#
+
+2.5 ONEWAY.  Contrast Tests
+#===============================================#=================#==========#=====#=====#===============#
+#                                       Contrast#Value of Contrast|Std. Error|  t  |  df |Sig. (2-tailed)#
+#===============#======================#========#=================#==========#=====#=====#===============#
+#Breaking Strain|Assume equal variances|    1   #             3.80|     1.536|2.474|   12|           .029#
+#               |                      |    2   #             1.80|      .887|2.029|   12|           .065#
+#               |Does not assume equal |    1   #             3.80|     1.483|2.562|8.740|           .031#
+#               |                      |    2   #             1.80|      .917|1.964|7.720|           .086#
+#===============#======================#========#=================#==========#=====#=====#===============#
+
+EOF
+if [ $? -ne 0 ] ; then fail ; fi
+
 pass