Abstract the documents within a dictionary a little better. Thanks to

[pspp-builds.git] / tests / command / file-label.sh

diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh
index 79dd1c25f4040d7af6dca5fc3e47f812881deb27..48d8739bf61dbd1bd75eac1cd86334d792213c72 100755 (executable)
--- a/tests/command/file-label.sh
+++ b/tests/command/file-label.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This program tests the FILE LABEL and  DOCUMENT commands
+# This program tests the FILE LABEL and  DOCUMENT, and ADD DOCUMENT commands
 
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
@@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps
 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
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -16,6 +17,8 @@ top_srcdir=`cd $top_srcdir; pwd`
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
 
+LANG=C
+export LANG
 
 cleanup()
 {
@@ -71,18 +74,21 @@ add value labels x 1 'first label mark two'.
 /* Add a file label and a few documents.
 file label This is a test file label.
 document First line of a document
-This is the second very long line of a document in an attempt to overflow the input buffer with a really long line
-Note that the last line should end with a period: .
+Second line of a document
+The last line should end with a period: .
+
 
 /* Display the documents.
 display documents.
-display file label.    /* undocumented feature of PSPP
+display file label.
+
+ADD DOCUMENT 'Line one' 'Line two'.
 
 /* Save the active file then get it and display the documents again.
 save /OUTFILE='foo.save'.
 get /FILE='foo.save'.
 display documents.
-display file label.    /* undocumented feature of PSPP
+display file label.
 
 /* There is an interesting interaction that occurs if the 'execute'
 /* command below.  What happens is that an error message is output
@@ -101,7 +107,7 @@ display documents.
 save /OUTFILE='foo.save'.
 get /FILE='foo.save'.
 display documents.
-display file label.    /* undocumented feature of PSPP
+display file label.
 
 /* Done.
 
@@ -109,12 +115,12 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 # We need to filter out the dates/times
 activity="date filter"
-grep -v 'Document entered' $TEMPDIR/pspp.list > $TEMPDIR/pspp.filtered
+grep -v '[Ee]ntered' $TEMPDIR/pspp.list > $TEMPDIR/pspp.filtered
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
@@ -129,27 +135,33 @@ diff -b  $TEMPDIR/pspp.filtered - <<EOF
 |Y       |     1|  2-  2|F1.0  |
 +--------+------+-------+------+
 Documents in the active file:
-   First line of a document
-   This is the second very long line of a document in an attempt to overflow the
-   Note that the last line should end with a period: .
+document First line of a document
+Second line of a document
+The last line should end with a period: .
 File label:
 This is a test file label
 Documents in the active file:
-   First line of a document
-   This is the second very long line of a document in an attempt to overflow the
-   Note that the last line should end with a period: .
+document First line of a document
+Second line of a document
+The last line should end with a period: .
+Line one
+Line two
 File label:
 This is a test file label
 Documents in the active file:
-   First line of a document
-   This is the second very long line of a document in an attempt to overflow the
-   Note that the last line should end with a period: .
-   There should be another document now.
+document First line of a document
+Second line of a document
+The last line should end with a period: .
+Line one
+Line two
+document There should be another document now.
 Documents in the active file:
-   First line of a document
-   This is the second very long line of a document in an attempt to overflow the
-   Note that the last line should end with a period: .
-   There should be another document now.
+document First line of a document
+Second line of a document
+The last line should end with a period: .
+Line one
+Line two
+document There should be another document now.
 File label:
 This is a test file label
 EOF