From 6062f528bff0243cc421cb8a2c78e0f7a529b3aa Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 25 Sep 2010 19:42:09 -0700
Subject: [PATCH] tests: Convert FILE LABEL, DOCUMENT, ADD DOCUMENT tests to
 use Autotest.

---
 tests/automake.mk                             |  2 +-
 .../utilities/title.at}                       | 92 ++-----------------
 2 files changed, 10 insertions(+), 84 deletions(-)
 rename tests/{command/file-label.sh => language/utilities/title.at} (63%)
 mode change 100755 => 100644

diff --git a/tests/automake.mk b/tests/automake.mk
index 40ed64ac..f601a695 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/file-label.sh \
 	tests/command/file-handle.sh \
 	tests/command/filter.sh \
 	tests/command/get-data-txt.sh \
@@ -404,6 +403,7 @@ TESTSUITE_AT = \
 	tests/language/stats/frequencies.at \
 	tests/language/stats/oneway.at \
 	tests/language/utilities/set.at \
+	tests/language/utilities/title.at \
 	tests/language/xforms/compute.at \
 	tests/language/xforms/count.at \
 	tests/language/xforms/recode.at \
diff --git a/tests/command/file-label.sh b/tests/language/utilities/title.at
old mode 100755
new mode 100644
similarity index 63%
rename from tests/command/file-label.sh
rename to tests/language/utilities/title.at
index 239a2754..515bff5e
--- a/tests/command/file-label.sh
+++ b/tests/language/utilities/title.at
@@ -1,66 +1,7 @@
-#!/bin/sh
-
-# This program tests the FILE LABEL and  DOCUMENT, and ADD DOCUMENT commands
-
-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
-
-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
-
-activity="create program"
-cat > $TESTFILE << EOF
+AT_BANNER([TITLE and related commands])
 
+AT_SETUP([FILE LABEL and (ADD) DOCUMENT])
+AT_DATA([file-label.sps], [dnl
 /* Set up a dummy active file in memory.
 data list /X 1 Y 2.
 begin data.
@@ -114,22 +55,10 @@ display documents.
 display file label.
 
 /* Done.
-
-EOF
-if [ $? -ne 0 ] ; then no_result ; fi
-
-activity="run program"
-$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
-if [ $? -ne 0 ] ; then no_result ; fi
-
-# We need to filter out the dates/times
-activity="date filter"
-sed 's/(Entered [^)]*)/(Entered <date>)/' $TEMPDIR/pspp.csv > $TEMPDIR/pspp.filtered
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-activity="compare results"
-diff -c $TEMPDIR/pspp.filtered - <<EOF
+])
+AT_CHECK([pspp -o pspp.csv file-label.sps])
+dnl Filter out the dates/times
+AT_CHECK([[sed 's/(Entered [^)]*)/(Entered <date>)/' pspp.csv]], [0], [dnl
 Table: Reading 1 record from INLINE.
 Variable,Record,Columns,Format
 X,1,1-  1,F1.0
@@ -212,8 +141,5 @@ document There should be another document now.
 File label:
 
 This is a test file label
-EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-pass;
+])
+AT_CLEANUP
-- 
2.30.2