Expanded allowed text in mhical parse error message.

[nmh] / test / whom / test-whom

diff --git a/test/whom/test-whom b/test/whom/test-whom
index 8a5a656e595e0f5af7d8339b243ea3d60fb31204..0928fe94077371d35ba1b7e55fa22b3ae9ac8bac 100755 (executable)
--- a/test/whom/test-whom
+++ b/test/whom/test-whom
@@ -19,7 +19,7 @@ fi
 
 setup_test
 
 
 setup_test
 

-whom - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' whom -

 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual


@@ -35,6 +35,7 @@ This is a draft message.
 EOF
 
 # check -help
 EOF
 
 # check -help

+start_test "-help"

 # Only look at first 10 lines because the rest depend on
 # whether sasl support was configured in.
 cat >$expected <<EOF
 # Only look at first 10 lines because the rest depend on
 # whether sasl support was configured in.
 cat >$expected <<EOF


@@ -50,10 +51,11 @@ Usage: whom [switches] [file]
   -help
 EOF
 
   -help
 EOF
 

-run_prog whom -help | head -10 >$actual 2>&1
+run_prog whom -help 2>&1 | head -10 >$actual

 check $expected $actual
 
 # check -version
 check $expected $actual
 
 # check -version

+start_test "-version"

 case `whom -v` in
   whom\ --*) ;;
   *       ) echo "$0: whom -v generated unexpected output" 1>&2
 case `whom -v` in
   whom\ --*) ;;
   *       ) echo "$0: whom -v generated unexpected output" 1>&2


@@ -61,22 +63,27 @@ case `whom -v` in
 esac
 
 # check with no options
 esac
 
 # check with no options

+start_test "with no options"

 run_test 'whom' '  -- Network Recipients --
   user at example.com'
 
 # check -nocheck
 run_test 'whom' '  -- Network Recipients --
   user at example.com'
 
 # check -nocheck

+start_test "-nocheck"

 run_test 'whom -check -nocheck' '  -- Network Recipients --
   user at example.com'
 
 # check with file specified
 run_test 'whom -check -nocheck' '  -- Network Recipients --
   user at example.com'
 
 # check with file specified

+start_test "with file specified"

 run_test "whom $MH_TEST_DIR/Mail/draft" '  -- Network Recipients --
   user at example.com'
 
 # check -draftmessage
 run_test "whom $MH_TEST_DIR/Mail/draft" '  -- Network Recipients --
   user at example.com'
 
 # check -draftmessage

+start_test "-draftmessage"

 run_test "whom -draftm draft" '  -- Network Recipients --
   user at example.com'
 
 # check -draftfolder with -draftmessage
 run_test "whom -draftm draft" '  -- Network Recipients --
   user at example.com'
 
 # check -draftfolder with -draftmessage

+start_test "-draftfolder with -draftmessage"

 folder +drafts -create >/dev/null
 folder +inbox -fast >/dev/null
 cp $MH_TEST_DIR/Mail/draft $MH_TEST_DIR/Mail/drafts/1
 folder +drafts -create >/dev/null
 folder +inbox -fast >/dev/null
 cp $MH_TEST_DIR/Mail/draft $MH_TEST_DIR/Mail/drafts/1


@@ -85,23 +92,27 @@ run_test "whom -draftfolder +drafts -draftm 1" \
   user at example.com'
 
 # check -draftfolder with current draftmessage
   user at example.com'
 
 # check -draftfolder with current draftmessage

+start_test "-draftfolder with current draftmessage"

 folder +drafts 1 >/dev/null
 run_test "whom -draftfolder +drafts" \
 '  -- Network Recipients --
   user at example.com'
 
 # check -nodraftfolder
 folder +drafts 1 >/dev/null
 run_test "whom -draftfolder +drafts" \
 '  -- Network Recipients --
   user at example.com'
 
 # check -nodraftfolder

+start_test "-nodraftfolder"

 run_test 'whom -draftfolder +nonexistent -nodraftfolder' \
 '  -- Network Recipients --
   user at example.com'
 
 # check -draft, though I'm not sure that it's useful.  Note that it
 run_test 'whom -draftfolder +nonexistent -nodraftfolder' \
 '  -- Network Recipients --
   user at example.com'
 
 # check -draft, though I'm not sure that it's useful.  Note that it

+start_test "-draft, though I'm not sure that it's useful.  Note that it"

 # must appear after the file argument when run standalone.
 run_test "whom $MH_TEST_DIR/Mail/drafts/1 -draft" \
 '  -- Network Recipients --
   user at example.com'
 
 # check -alias
 # must appear after the file argument when run standalone.
 run_test "whom $MH_TEST_DIR/Mail/drafts/1 -draft" \
 '  -- Network Recipients --
   user at example.com'
 
 # check -alias

+start_test "-alias"

 rm -f $MH_TEST_DIR/Mail/draft
 cat >$MH_TEST_DIR/Mail/draft <<'EOF'
 From: Test1 <test1@example.com>
 rm -f $MH_TEST_DIR/Mail/draft
 cat >$MH_TEST_DIR/Mail/draft <<'EOF'
 From: Test1 <test1@example.com>


@@ -118,8 +129,10 @@ run_test 'whom -alias nmhaliases' '  -- Network Recipients --
   user1 at example.com'
 
 # check -alias with nonexistent aliasfile
   user1 at example.com'
 
 # check -alias with nonexistent aliasfile

+start_test "-alias with nonexistent aliasfile"

 run_test 'whom -alias nonexistent' \
 "whom: aliasing error in nonexistent - unable to read 'nonexistent'"
 
 
 run_test 'whom -alias nonexistent' \
 "whom: aliasing error in nonexistent - unable to read 'nonexistent'"
 
 

+finish_test

 exit $failed
 exit $failed