X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/93a31f9b884f8e8f3f7a7d50cf90ffd365a14f7c..803f254122dc757db104a4c36cf98b726be004be:/test/new/test-basic?ds=inline

diff --git a/test/new/test-basic b/test/new/test-basic
index ca1a4cf2..1fba4609 100755
--- a/test/new/test-basic
+++ b/test/new/test-basic
@@ -6,21 +6,13 @@
 ######################################################
 
 if test -z "${MH_OBJ_DIR}"; then
-    srcdir=`dirname $0`/../..
-    MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+    srcdir=`dirname "$0"`/../..
+    MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
 fi
 
 . "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
-# TODO: Move to a common file tests can source; need more framework...
-failed=0
-check() {
-    diff -u $expected $actual
-    if [ $? -ne 0 ]; then
-        failed=$((failed + 1))
-    fi
-}
 
 folders=$MH_TEST_DIR/Mail/.folders
 
@@ -40,24 +32,24 @@ EOF
 cat > $expected <<EOF
 new: must specify sequences or set Unseen-Sequence
 EOF
-new > $actual 2>&1
-check
+run_prog new > $actual 2>&1
+check $expected $actual
 
 # test with no desired messages
 cat > $expected <<EOF
  total      0.
 EOF
-new aseq > $actual 2>&1
-check
-new -folders $folders aseq > $actual 2>&1
-check
+run_prog new aseq > $actual 2>&1
+check $expected $actual 'keep first'
+run_prog new -folders $folders aseq > $actual 2>&1
+check $expected $actual
 
 # test fnext/fprev with no desired messages
 cat /dev/null > $expected
-fnext aseq > $actual 2>&1
-check
-fprev aseq > $actual 2>&1
-check
+run_prog fnext aseq > $actual 2>&1
+check $expected $actual 'keep first'
+run_prog fprev aseq > $actual 2>&1
+check $expected $actual
 
 # add 1 desired message in each folder
 echo 'aseq: 1' > $MH_TEST_DIR/Mail/inbox/.mh_sequences
@@ -71,8 +63,8 @@ foo2       1.  1
 inbox      1.* 1
  total      3.
 EOF
-new aseq > $actual 2>&1
-check
+run_prog new aseq > $actual 2>&1
+check $expected $actual
 
 # test with .folders
 cat > $expected <<EOF
@@ -80,8 +72,8 @@ inbox      1.* 1
 foo2       1.  1
  total      2.
 EOF
-new -folders $folders aseq > $actual 2>&1
-check
+run_prog new -folders $folders aseq > $actual 2>&1
+check $expected $actual
 
 # add 2 desired messages to another sequence in each folder
 echo 'bseq: 3-4' >> $MH_TEST_DIR/Mail/inbox/.mh_sequences
@@ -95,13 +87,13 @@ foo2       3.  1 3-4
 inbox      3.* 1 3-4
  total      9.
 EOF
-new aseq bseq > $actual 2>&1
-check
+run_prog new aseq bseq > $actual 2>&1
+check $expected $actual 'keep first'
 
 # set aseq bseq as unseen
 echo 'Unseen-Sequence: aseq bseq' >> $MH
-new > $actual 2>&1
-check
+run_prog new > $actual 2>&1
+check $expected $actual
 
 # test unseen
 cat > $expected <<EOF
@@ -121,57 +113,57 @@ cat > $expected <<EOF
    3  09/29 Test3              Testing message 3<<This is message number 3 >>
    4  09/29 Test4              Testing message 4<<This is message number 4 >>
 EOF
-unseen > $actual 2>&1
-check
+run_prog unseen > $actual 2>&1
+check $expected $actual
 
 # test fnext with the current folder not in the list
 echo 'Current-Folder: foo1' > $MH_TEST_DIR/Mail/context
 echo 'inbox  1 3-4' > $expected
-fnext -folders $folders > $actual 2>&1
-check
+run_prog fnext -folders $folders > $actual 2>&1
+check $expected $actual
 
 # test fprev with the current folder not in the list
 echo 'Current-Folder: foo1' > $MH_TEST_DIR/Mail/context
 echo 'inbox  1 3-4' > $expected
-fprev -folders $folders > $actual 2>&1
-check
+run_prog fprev -folders $folders > $actual 2>&1
+check $expected $actual
 
 # test fnext with current folder in the middle of the list
 echo 'Current-Folder: foo2' > $MH_TEST_DIR/Mail/context
 echo 'inbox  1 3-4' > $expected
-fnext > $actual 2>&1
-check
+run_prog fnext > $actual 2>&1
+check $expected $actual
 
 # test fprev with current folder in the middle of the list
 echo 'Current-Folder: foo2' > $MH_TEST_DIR/Mail/context
 echo 'foo1  1 3-4' > $expected
-fprev > $actual 2>&1
-check
+run_prog fprev > $actual 2>&1
+check $expected $actual
 
 # test fprev with current folder at the beginning of the list
 echo 'Current-Folder: foo1' > $MH_TEST_DIR/Mail/context
 echo 'inbox  1 3-4' > $expected
-fprev > $actual 2>&1
-check
+run_prog fprev > $actual 2>&1
+check $expected $actual
 
 # test fnext with current folder at the end of the list
 echo 'Current-Folder: inbox' > $MH_TEST_DIR/Mail/context
 echo 'foo1  1 3-4' > $expected
-fnext > $actual 2>&1
-check
+run_prog fnext > $actual 2>&1
+check $expected $actual
 
 # test fnext with no current folder
 rm $MH_TEST_DIR/Mail/context
 echo 'foo1  1 3-4' > $expected
-fnext > $actual 2>&1
-check
+run_prog fnext > $actual 2>&1
+check $expected $actual
 
 # test fnext with only one folder in the list
 cat > $folders <<EOF
 inbox
 EOF
 echo 'inbox  1 3-4' > $expected
-fnext -folders $folders > $actual 2>&1
-check
+run_prog fnext -folders $folders > $actual 2>&1
+check $expected $actual
 
 exit $failed