X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b1b999eb0d2f9f63a4ddead798088e5f49160dd1..d4736bd755993627bf6abf7b7421524f5749cf11:/test/mhfixmsg/test-mhfixmsg diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg index 09f7f76b..5a310f11 100755 --- a/test/mhfixmsg/test-mhfixmsg +++ b/test/mhfixmsg/test-mhfixmsg @@ -41,6 +41,7 @@ Usage: mhfixmsg [+folder] [msgs] [switches] -nodecodetext -[no]textcodeset -[no]reformat + -[no]replacetextplain -[no]fixboundary -[no]fixcte -file file @@ -606,30 +607,6 @@ Content-Type: text/html; charset="ISO-8859-1" Content-Transfer-Encoding: quoted-printable - - - - - - -------=_nmh-multipart-- EOF cat >`mhpath new` <<'EOF' @@ -666,17 +643,13 @@ d>
Mile $0.00
Time $78.71
State Tax $5.90
Vehicle License Fee $1.84
State Txn Tax $6.00
EOF -# ???? debug on Solaris -egrep mhfixmsg $(mhparam etcdir)/mhn.defaults # ???? if [ $can_reformat_texthtml -eq 1 ]; then #### lynx inserts multiple blank lines, so use uniq to squeeze them. - # ???? mhfixmsg last -outfile - | uniq >"$actual" - # ???? temporarily add -verbose to debug on Solaris - mhfixmsg -verbose last -outfile - | uniq >"$actual" # ???? + #### Truncate to avoid comparing the html portion because it can + #### get reformatted. + mhfixmsg last -outfile - | uniq | head -22 >"$actual" check "$expected" "$actual" 'ignore space' else - # ???? temporarily added to debug on Solaris - echo "can't reformat text/html" # ???? cp -p "$MH_TEST_DIR/Mail/inbox/15" "$MH_TEST_DIR/Mail/inbox/15.backup" rm -f "$expected" fi @@ -971,6 +944,106 @@ mhfixmsg last -outfile "$actual" check "$expected" "$actual" +# check -replacetextplain +cat >"$expected" < +eticket + + + Yes, the text/plain part really was empty. + + + +------=_Part_876302-- +EOF + +cat >`mhpath new` <<'EOF' +To: recipient@example.com +From: sender@example.com +Subject: mhfixmsg replacement of bad text/plain part test +MIME-Version: 1.0 +Content-Type: multipart/alternative; boundary="----=_Part_876302" + +------=_Part_876302 +Content-Type: text/plain; charset="iso-8859-15" +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + + + +------=_Part_876302 +Content-Type: text/html; charset="UTF-8" +Content-Transfer-Encoding: 8bit +Content-Disposition: inline + + +eticket + + + Yes, the text/plain part really was empty. + + + +------=_Part_876302-- +EOF + +#### lynx inserts multiple blank lines, so use uniq to squeeze them. +mhfixmsg last -replacetextplain -outfile - | uniq > "$actual" +check "$expected" "$actual" + + +# check -noreplacetextplain +cat >"$expected" < +eticket + + + Yes, the text/plain part really was empty. + + + +------=_Part_876302-- +EOF + +mhfixmsg last -replacetextplain -noreplacetextplain -outfile "$actual" +check "$expected" "$actual" + + # check rmmproc cat >"$MH_TEST_DIR/Mail/rmmproc" <<'EOF' mv "$1" "$1.backup"