Merge commit '3d0e5b6a4383a5228732edd6cb1532375b771262'

[nmh] / test / comp / test-comp-format

diff --git a/test/comp/test-comp-format b/test/comp/test-comp-format
index 1f1f8c538439239cede8b7ce380d4e9967d2d5e2..a7bc502f1eac411ba2e035b1f22a1aac403cdf2e 100755 (executable)
--- a/test/comp/test-comp-format
+++ b/test/comp/test-comp-format
@@ -13,6 +13,34 @@ fi
 
 setup_test
 
+check_exit '-eq 1' comp -
+check_exit '-eq 1' comp -xyzzy
+check_exit '-eq 0' comp -help
+check_exit '-eq 0' comp -version
+check_exit '-eq 1' comp -build -noedit -editor
+check_exit '-eq 1' comp -whatnowproc
+check_exit '-eq 1' comp -whatnowproc '' -
+check_exit '-eq 1' comp -use -nouse -form
+check_exit '-eq 1' comp -file
+check_exit '-eq 1' comp -file foo -file
+check_exit '-eq 1' comp -nodraftfolder -draftfolder
+check_exit '-eq 1' comp -draftfolder foo -draftfolder
+check_exit '-eq 1' comp -draftmessage
+check_exit '-eq 1' comp -draftmessage foo -draftmessage
+check_exit '-eq 1' comp -to
+check_exit '-eq 1' comp -cc
+check_exit '-eq 1' comp -from
+check_exit '-eq 1' comp -fcc
+check_exit '-eq 1' comp -fcc @ -
+check_exit '-eq 1' comp -width
+check_exit '-eq 1' comp -width 0
+check_exit '-eq 1' comp -subject
+check_exit '-eq 1' comp + @
+check_exit '-eq 1' comp 42 314
+check_exit '-eq 1' comp -form foo 42
+check_exit '-eq 1' comp +
+check_exit '-eq 1' comp 42
+
 #
 # Create a test template file (we create one here just in case the master
 # one changes)
@@ -30,20 +58,22 @@ EOF
 
 expected="${MH_TEST_DIR}/$$.expected"
 actual="${MH_TEST_DIR}/Mail/draft"
-from="Mr Test User <test@user.com>"
-to1="User One <userone@test.com>"
-to2="User Two <usertwo@test.com>"
-cc1="CC User One <ccuserone@test.com>"
-cc2="CC User Two <ccusertwo@test.com>"
-cc3="CC User Three <ccuserthree@test.com>"
-cc4="CC User Four <ccuserfour@test.com>"
+from="Mr Test User <test@example.com>"
+to1="User One <userone@example.com>"
+to2="User Two <usertwo@example.com>"
+cc1="CC User One <ccuserone@example.com>"
+cc2="CC User Two <ccusertwo@example.com>"
+cc3="CC User Three <ccuserthree@example.com>"
+cc4="CC User Four <ccuserfour@example.com>"
 fcc1="+nosuchmailbox"
 fcc2="+nosuchmailbox2"
 subject="Totally bogus subject"
 
+start_test 'check -from, -to, -cc, -fcc, and -subject switches'
 cat > $expected <<EOF
 From: ${from}
-To: ${to1}, ${to2}
+To: ${to1},
+    ${to2}
 cc: ${cc1},
     ${cc2},
     ${cc3},
@@ -52,13 +82,42 @@ Fcc: ${fcc1}, ${fcc2}
 Subject: ${subject}
 --------
 EOF
-
+run_prog \
 comp -editor true -form "${form}" -from "${from}" -to "${to1}" -to "${to2}" \
     -cc "${cc1}" -cc "${cc2}" -cc "${cc3}" -cc "${cc4}" -fcc "${fcc1}" \
     -fcc "${fcc2}" -subject "${subject}" -width 60 -nowhatnowproc || exit 1
+check "${expected}" "${actual}"
 
+
+start_test 'check -fcc with no fcc in components'
+cat > $form <<EOF
+%<{from}%|%(void(localmbox))%>%(void(width))%(putaddr From: )
+%<{to}%(void(width))%(putaddr To: )%|To:%>
+%<{cc}%(void(width))%(putaddr cc: )%|cc:%>
+Subject:%<{subject} %(putstr)%>
+--------
+EOF
+#### There won't be an Fcc: header because there isn't one in the components.
+cat > $expected <<EOF
+From: ${from}
+To: ${to1},
+    ${to2}
+cc: ${cc1},
+    ${cc2},
+    ${cc3},
+    ${cc4}
+Subject: ${subject}
+--------
+EOF
+
+run_prog \
+comp -editor true -form "${form}" -from "${from}" -to "${to1}" -to "${to2}" \
+    -cc "${cc1}" -cc "${cc2}" -cc "${cc3}" -cc "${cc4}" -fcc "${fcc1}" \
+    -fcc "${fcc2}" -subject "${subject}" -width 60 -nowhatnowproc || exit 1
 check "${expected}" "${actual}"
 
+
 test "${failed:-0}" -eq 0 && rm "${form}"
 
+finish_test
 exit $failed