Review inc.man.

[nmh] / test / prompter / test-prompter

diff --git a/test/prompter/test-prompter b/test/prompter/test-prompter
index 4cf8539b79ed7bb3935c60bc0762547a4c5ec365..65ed8a96ddf02b31de9f1333d574e90e531d77e7 100755 (executable)
--- a/test/prompter/test-prompter
+++ b/test/prompter/test-prompter
@@ -16,6 +16,8 @@ fi
 
 setup_test
 
+check_exit '-eq 1' prompter -
+
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
@@ -35,14 +37,15 @@ Usage: prompter [switches] file
   -help
 EOF
 
-prompter -help >$actual 2>&1
-check $expected $actual
+#### Skip nmh intro text.
+run_prog prompter -help | sed '/^$/,$d' >"$actual" 2>&1
+check "$expected" "$actual"
 
 # check -version
 case `prompter -v` in
   prompter\ --*) ;;
-  *           ) printf "$0: prompter -v generated unexpected output\n" >&2
-                failed=`expr ${failed:-0} + 1`;;
+  *            ) printf '%s: prompter -v generated unexpected output\n' "$0" >&2
+                 failed=`expr ${failed:-0} + 1`;;
 esac
 
 # check unknown switch
@@ -69,8 +72,8 @@ Resent-cc:
 Resent-fcc:
 EOF
 
-printf "recipient@example.com\ncc@example.com\n+outbox\nmessage body\n" | \
-  prompter $MH_TEST_DIR/prompter-file > /dev/null
+printf 'recipient@example.com\ncc@example.com\n+outbox\nmessage body\n' | \
+  run_prog prompter $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file" 'keep first'
 
@@ -82,8 +85,8 @@ Resent-cc:
 Resent-fcc:
 EOF
 
-printf "recipient@example.com\ncc@example.com\n+outbox\nmessage body\n.\n" | \
-  prompter -doteof $MH_TEST_DIR/prompter-file > /dev/null
+printf 'recipient@example.com\ncc@example.com\n+outbox\nmessage body\n.\n' | \
+  run_prog prompter -doteof $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file" 'keep first'
 
@@ -95,8 +98,8 @@ Resent-cc:
 Resent-fcc:
 EOF
 
-printf "recipient@example.com\ncc@example.com\n+outbox\nmessage body\n" | \
-  prompter -doteof -nodoteof $MH_TEST_DIR/prompter-file > /dev/null
+printf 'recipient@example.com\ncc@example.com\n+outbox\nmessage body\n' | \
+  run_prog prompter -doteof -nodoteof $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file" 'keep first'
 
@@ -110,10 +113,10 @@ Resent-fcc:
 message body
 EOF
 
-printf "appendage\n" >> "$expected"
+printf 'appendage\n' >>"$expected"
 
-printf "recipient@example.com\ncc@example.com\n+outbox\nappendage\n" | \
-  prompter -noprepend $MH_TEST_DIR/prompter-file > /dev/null
+printf 'recipient@example.com\ncc@example.com\n+outbox\nappendage\n' | \
+  run_prog prompter -noprepend $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file"
 
@@ -137,8 +140,8 @@ prependage
 message body
 EOF
 
-printf "recipient@example.com\ncc@example.com\n+outbox\nprependage\n" | \
-  prompter -noprepend -prepend $MH_TEST_DIR/prompter-file > /dev/null
+printf 'recipient@example.com\ncc@example.com\n+outbox\nprependage\n' | \
+  run_prog prompter -noprepend -prepend $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$MH_TEST_DIR/prompter-file" "$expected" 'keep first'
 
@@ -154,7 +157,7 @@ Resent-fcc: +outbox
 --------
 EOF
 
-prompter -rapid $MH_TEST_DIR/prompter-file > "$actual" < /dev/null
+run_prog prompter -rapid $MH_TEST_DIR/prompter-file >"$actual" </dev/null
 
 check "$expected" "$actual"
 
@@ -172,7 +175,8 @@ message body
 --------
 EOF
 
-prompter -rapid -norapid $MH_TEST_DIR/prompter-file > "$actual" < /dev/null
+run_prog prompter -rapid -norapid $MH_TEST_DIR/prompter-file \
+  >"$actual" </dev/null
 
 check "$expected" "$actual"
 
@@ -194,8 +198,8 @@ message body
 --------
 EOF
 
-printf "woot woot\n" | \
-  prompter -erase '\15' -kill '\7f' $MH_TEST_DIR/prompter-file > "$actual"
+printf 'woot woot\n' | \
+  run_prog prompter -erase '\15' -kill '\7f' $MH_TEST_DIR/prompter-file >"$actual"
 
 check "$expected" "$actual"
 
@@ -215,7 +219,8 @@ message body
 --------
 EOF
 
-prompter -nobody -body $MH_TEST_DIR/prompter-file > "$actual" < /dev/null
+run_prog prompter -nobody -body $MH_TEST_DIR/prompter-file >"$actual" \
+  </dev/null
 
 check "$expected" "$actual"
 
@@ -227,7 +232,7 @@ Resent-cc: cc@example.com
 Resent-fcc: +outbox
 EOF
 
-printf "woot woot\n" | prompter -nobody $MH_TEST_DIR/prompter-file > /dev/null
+run_prog prompter -nobody $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file"