HTML Content

X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/aea16162c12426db8747be3a4328ffd4c66db5aa..9541a3277343b7920565da71402a41b69e56c9fb:/test/mhfixmsg/test-mhfixmsg diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg index cfe21af3..b8e0b426 100755 --- a/test/mhfixmsg/test-mhfixmsg +++ b/test/mhfixmsg/test-mhfixmsg @@ -12,103 +12,72 @@ if test -z "${MH_OBJ_DIR}"; then MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR fi -. "${srcdir}/test/post/test-post-common.sh" +. "${MH_OBJ_DIR}/test/common.sh" +setup_test + +#### Make sure that html-to-text conversion is what we expect. +require_locale en_US.utf-8 en_US.utf8 +LC_ALL=en_US.UTF-8; export LC_ALL expected="$MH_TEST_DIR/test-mhfixmsg$$.expected" expected_err="$MH_TEST_DIR/test-mhfixmsg$$.expected_err" actual="$MH_TEST_DIR/test-mhfixmsg$$.actual" actual_err="$MH_TEST_DIR/test-mhfixmsg$$.actual_err" -set +e -if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \ +mhn_defaults="$MH_INST_DIR${nmhetcdir}/mhn.defaults" + +if grep mhfixmsg-format-text/html "${mhn_defaults}" \ >/dev/null; then can_reformat_texthtml=1 + if grep 'mhfixmsg-format-text/html.*w3m' "${mhn_defaults}" \ + >/dev/null; then + #### w3m uses $HOME/.w3m/, and creates it if it doesn't exist. To + #### support testing with non-writeable $HOME, and to not leave + #### relics from this test if it is writeable but doesn't already + #### have a .w3m, and to not depend on whatever is in that if it + #### does already exist, overwrite $HOME if using w3m. + HOME="$MHTMPDIR"; export HOME + fi else - echo "$0: skipping -reformat check because - mhfixmsg-format-text/html is not available" + echo "$0: skipping -reformat check because no text browser was found" can_reformat_texthtml=0 fi -set -e # check -help -# Verified behavior consistent with compiled sendmail. cat >"$expected" <"$actual" 2>&1 +run_prog mhfixmsg -help >"$actual" 2>&1 check "$expected" "$actual" # check -version -# Verified same behavior as compiled mhfixmsg. case `mhfixmsg -version` in mhfixmsg\ --*) ;; *) printf '%s: mhfixmsg -version generated unexpected output\n' "$0" >&2 failed=`expr ${failed:-0} + 1`;; esac -# ???? -cat >`mhpath new` <<'EOF' -MIME-Version: 1.0 -Content-Type: text/html; charset="ISO-8859-1" -Content-Transfer-Encoding: quoted-printable -Date: Thu, 11 Apr 2013 02:47:08 -0700 -To: -From: -Subject: body requires binary encoding - - - - - - - -EOF - -if [ $can_reformat_texthtml -eq 1 ]; then - #### lynx inserts multiple blank lines, so use uniq to squeeze them. - mhfixmsg last -outfile - | uniq >"$actual" - check "$expected" "$actual" 'ignore space' -else - cp -p "$MH_TEST_DIR/Mail/inbox/15" "$MH_TEST_DIR/Mail/inbox/15.backup" - rm -f "$expected" -fi -exit # ???? - # check that non-MIME messages aren't modified # check -outfile @@ -222,7 +191,7 @@ check "$MH_TEST_DIR"/Mail/inbox/,11 "$MH_TEST_DIR"/Mail/inbox/11.original # check -reformat (enabled by default): addition of text/plain part # to solitary text/html part # -cat >"$expected" <"$expected" <"$expected.err" - #### lynx inserts multiple blank lines, so use uniq to squeeze them. - mhfixmsg last -outfile - -verbose 2>"$actual.err" | uniq >"$actual" - check "$expected" "$actual" + #### lynx inserts multiple blank lines, so squeeze them. + run_prog mhfixmsg last -outfile - -verbose 2>"$actual.err" | \ + squeeze_lines >"$actual" + check "$expected" "$actual" 'ignore space' check "$expected.err" "$actual.err" +else + rm -f "$expected" fi +# check implicit -file with absolute pathname +run_test "mhfixmsg `mhpath last` -outfile /dev/null" '' + + # check handling of boundary string that appears in message body # -cat >"$expected" <"$expected" <"$expected.err" - #### lynx inserts multiple blank lines, so use uniq to squeeze them. - mhfixmsg last -outfile - -verbose 2>"$actual.err" | uniq >"$actual" - check "$expected" "$actual" + #### lynx inserts multiple blank lines, so squeeze them. + run_prog mhfixmsg last -outfile - -verbose 2>"$actual.err" | \ + squeeze_lines >"$actual" + check "$expected" "$actual" 'ignore space' check "$expected.err" "$actual.err" +else + rm -f "$expected" fi # check -nodecode -cat >"$expected" <"$expected" <"$expected.err" - #### lynx inserts multiple blank lines, so use uniq to squeeze them. - mhfixmsg last -nodecode -outfile - -verbose 2>"$actual.err" | uniq >"$actual" - check "$expected" "$actual" + #### lynx inserts multiple blank lines, so squeeze them. + run_prog mhfixmsg last -nodecode -outfile - -verbose 2>"$actual.err" | \ + squeeze_lines >"$actual" + check "$expected" "$actual" 'ignore space' check "$expected.err" "$actual.err" +else + rm -f "$expected" fi @@ -471,7 +453,7 @@ VGhpcyBpcyBhIHRleHQvcGxhaW4gcGFydC4K ------- =_aaaaaaaaaa0-- EOF -mhfixmsg last -outfile "$actual" +run_prog mhfixmsg last -outfile "$actual" check "$expected" "$actual" @@ -487,8 +469,7 @@ This is additional content before the first subpart of the multipart. ------- =_aaaaaaaaaa0 Content-Type: multipart/related; - type="multipart/alternative"; - boundary="subpart__1.1" + type="text/plain"; boundary="subpart__1.1" --subpart__1.1 Content-Type: text/plain; charset="iso-8859-1" @@ -537,8 +518,7 @@ This is additional content before the first subpart of the multipart. ------- =_aaaaaaaaaa0 Content-Type: multipart/related; - type="multipart/alternative"; - boundary="subpart__1.1" + type="text/plain"; boundary="subpart__1.1" --subpart__1.1 Content-Type: text/plain; charset="iso-8859-1" @@ -575,13 +555,13 @@ VGhpcyBpcyB0aGUgZm91cnRoIHRleHQvcGxhaW4gcGFydC4K This is additional content after the last subpart of the multipart. EOF -mhfixmsg last -outfile "$actual" +run_prog mhfixmsg last -outfile "$actual" check "$expected" "$actual" # check attempted -decode of binary text #### Generated the encoded text below with: -#### $ printf '\x0d\xbd\xb2=\xbc\n' | base64 +#### $ printf '\x0\xbd\xb2=\xbc\n' | base64 cat >`mhpath new` <"$expected" <<'EOF' +prepare_space >"$expected" <<'EOF' MIME-Version: 1.0 Date: Thu, 11 Apr 2013 02:47:08 -0700 To: @@ -651,30 +629,6 @@ Content-Type: text/html; charset="ISO-8859-1" Content-Transfer-Encoding: quoted-printable -

Mile		$0.00
Time	$78.71
<= -font face=3D"Arial, Helvetica, sans-serif" color=3D"#333333" size=3D"2">State Tax		$5.90
Vehicle License Fee		$1.84
State Txn Tax		$6.00

- - - - - -------=_nmh-multipart-- EOF cat >`mhpath new` <<'EOF' @@ -712,8 +666,10 @@ d>

Mile		$0.00
Time		$78.71
State Tax		$5.90
Vehicle License Fee		$1.84
State Txn Tax		$6.00
"$actual" + #### lynx inserts multiple blank lines, so squeeze them. + #### Truncate to avoid comparing the html portion because it can + #### get reformatted. + run_prog mhfixmsg last -outfile - \| squeeze_lines \| head -22 >"$actual" check "$expected" "$actual" 'ignore space' else cp -p "$MH_TEST_DIR/Mail/inbox/15" "$MH_TEST_DIR/Mail/inbox/15.backup" @@ -721,13 +677,13 @@ else fi -# check -textcodeset +# check -textcharset # Also checks preservation of attributes after one (charset) that is # modified. cat >"$expected" <`mhpath new` <"$actual.err" -if grep "mhfixmsg: Can't convert .* to .* without iconv" "$actual.err" \ - >/dev/null; then - echo skipping -textcodeset check because nmh was built without iconv - rm -f "$expected" "$actual" "$actual.err" -else +if test "$ICONV_ENABLED" -eq 1; then + run_prog mhfixmsg last -textcharset utf-8 -outfile "$actual" 2>&1 check "$expected" "$actual" - rm "$actual.err" +else + echo "$0: skipping -textcharset check because nmh was built without iconv" + rm -f "$expected" fi -set -e # check -nofixboundary @@ -804,7 +756,7 @@ check "$MH_TEST_DIR"/Mail/inbox/17 "$MH_TEST_DIR"/Mail/inbox/18 'keep first' # check that message is not output when fed through stdin -mhfixmsg -file - -verbose <`mhpath last` >"$actual" 2>"$actual.err" +run_prog mhfixmsg -file - -verbose <`mhpath last` >"$actual" 2>"$actual.err" check "$expected" "$actual" if grep "mhfixmsg: $MH_TEST_DIR/Mail/.*, fix multipart boundary" \ "$actual.err" >/dev/null; then @@ -821,7 +773,7 @@ fi cat >"$expected" < @@ -843,24 +795,16 @@ run_test 'mhfixmsg last -outfile '"$actual"' -verbose' \ check "$expected" "$actual" -# check that text/plain part is added to lone text/html in multipart/related -cat >"$expected" <`mhpath new` < -------=_nmh-multipart1-- - ------=_Part_90310_101292502.1 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit @@ -884,37 +826,12 @@ Your email client does not support HTML messages ------=_Part_90310_101292502.1-- EOF -cat >`mhpath new` < - - HTML Content - - - This is the real content. - - -------=_Part_90310_101292502.1 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit - -Your email client does not support HTML messages -------=_Part_90310_101292502.1-- -EOF +cp -p `mhpath last` "$expected" if [ $can_reformat_texthtml -eq 1 ]; then - #### lynx inserts multiple blank lines, so use uniq to squeeze them. - mhfixmsg last -outfile - \| uniq >"$actual" - check "$expected" "$actual" + #### lynx inserts multiple blank lines, so squeeze them. + run_prog mhfixmsg last -outfile - \| squeeze_lines >"$actual" + check "$expected" "$actual" 'ignore space' else rm -f "$expected" fi @@ -1006,7 +923,164 @@ There are two CR-LF pairs at the end of this sentence. EOF -mhfixmsg last -outfile "$actual" +run_prog mhfixmsg last -outfile "$actual" +check "$expected" "$actual" + + +# check -replacetextplain +prepare_space >"$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 + +if [ $can_reformat_texthtml -eq 1 ]; then + #### lynx inserts multiple blank lines, so squeeze them. + run_prog mhfixmsg last -replacetextplain -outfile - \| \ + squeeze_lines > "$actual" + check "$expected" "$actual" 'ignore space' +else + rm -f "$expected" +fi + + +# check -noreplacetextplain +cat >"$expected" < +eticket + + + Yes, the text/plain part really was empty. + + + +------=_Part_876302-- +EOF + +run_prog mhfixmsg last -replacetextplain -noreplacetextplain -outfile "$actual" +check "$expected" "$actual" + + +# check removal of extraneous trailing semicolon from header parameter list +cat >"$expected" <`mhpath new` <"$expected" <`mhpath new` <"$actual"