make the %(size) function useful in mhshow marker line formats

[nmh] / test / mhfixmsg / test-mhfixmsg

diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index 9cd0a0df7d45b55370195829b2666ce91d934058..d60b9d768d7942021bfa080e69971061925a2167 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -19,7 +19,9 @@ 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"
 
 actual="$MH_TEST_DIR/test-mhfixmsg$$.actual"
 actual_err="$MH_TEST_DIR/test-mhfixmsg$$.actual_err"
 

-set +e
+#### Make sure that html-to-text conversion is what we expect.
+LC_ALL=en_US.UTF-8; export LC_ALL
+

 if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \
   >/dev/null; then
   can_reformat_texthtml=1
 if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \
   >/dev/null; then
   can_reformat_texthtml=1


@@ -30,15 +32,12 @@ if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \
     #### 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.
     #### 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
+    HOME="$MHTMPDIR"; export HOME

   fi
 else
   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
   can_reformat_texthtml=0
 fi

-set -e

 
 
 # check -help
 
 
 # check -help


@@ -48,7 +47,7 @@ Usage: mhfixmsg [+folder] [msgs] [switches]
   switches are:
   -decodetext 8bit|7bit
   -nodecodetext
   switches are:
   -decodetext 8bit|7bit
   -nodecodetext

-  -[no]textcodeset
+  -[no]textcharset

   -[no]reformat
   -[no]replacetextplain
   -[no]fixboundary
   -[no]reformat
   -[no]replacetextplain
   -[no]fixboundary


@@ -62,7 +61,7 @@ Usage: mhfixmsg [+folder] [msgs] [switches]
   -help
 EOF
 
   -help
 EOF
 

-mhfixmsg -help >"$actual" 2>&1
+run_prog mhfixmsg -help >"$actual" 2>&1

 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 
 


@@ -187,7 +186,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
 #
 # check -reformat (enabled by default):  addition of text/plain part
 # to solitary text/html part
 #

-cat >"$expected" <<EOF
+prepare_space >"$expected" <<EOF

 MIME-Version: 1.0
 From: sender@example.com
 To: bonquiqui@example.com
 MIME-Version: 1.0
 From: sender@example.com
 To: bonquiqui@example.com


@@ -249,9 +248,10 @@ if [ $can_reformat_texthtml -eq 1 ]; then
 mhfixmsg: 12 part 1, decode text/html; charset=\"Windows-1252\"" \
        >"$expected.err"
 
 mhfixmsg: 12 part 1, decode text/html; charset=\"Windows-1252\"" \
        >"$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"
   check "$expected.err" "$actual.err"
 else
   rm -f "$expected"


@@ -264,7 +264,7 @@ run_test "mhfixmsg `mhpath last` -outfile /dev/null" ''
 
 # check handling of boundary string that appears in message body
 #
 
 # check handling of boundary string that appears in message body
 #

-cat >"$expected" <<EOF
+prepare_space >"$expected" <<EOF

 MIME-Version: 1.0
 From: sender@example.com
 To: bonquiqui@example.com
 MIME-Version: 1.0
 From: sender@example.com
 To: bonquiqui@example.com


@@ -330,9 +330,10 @@ if [ $can_reformat_texthtml -eq 1 ]; then
 mhfixmsg: 12 part 1, decode text/html; charset=\"Windows-1252\"" \
        >"$expected.err"
 
 mhfixmsg: 12 part 1, decode text/html; charset=\"Windows-1252\"" \
        >"$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"
   check "$expected.err" "$actual.err"
 else
   rm -f "$expected"


@@ -340,7 +341,7 @@ fi
 
 
 # check -nodecode
 
 
 # check -nodecode

-cat >"$expected" <<EOF
+prepare_space >"$expected" <<EOF

 MIME-Version: 1.0
 From: sender@example.com
 To: bonquiqui@example.com
 MIME-Version: 1.0
 From: sender@example.com
 To: bonquiqui@example.com


@@ -402,9 +403,10 @@ EOF
 if [ $can_reformat_texthtml -eq 1 ]; then
   printf '%s\n' 'mhfixmsg: 12, insert text/plain part' >"$expected.err"
 
 if [ $can_reformat_texthtml -eq 1 ]; then
   printf '%s\n' 'mhfixmsg: 12, insert text/plain part' >"$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"
   check "$expected.err" "$actual.err"
 else
   rm -f "$expected"


@@ -446,7 +448,7 @@ VGhpcyBpcyBhIHRleHQvcGxhaW4gcGFydC4K
 ------- =_aaaaaaaaaa0--
 EOF
 
 ------- =_aaaaaaaaaa0--
 EOF
 

-mhfixmsg last -outfile "$actual"
+run_prog mhfixmsg last -outfile "$actual"

 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 
 


@@ -550,13 +552,13 @@ VGhpcyBpcyB0aGUgZm91cnRoIHRleHQvcGxhaW4gcGFydC4K
 
 This is additional content after the last subpart of the multipart.
 EOF
 
 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:
 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` <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >`mhpath new` <<EOF
 To: recipient@example.com
 From: sender@example.com


@@ -565,18 +567,16 @@ MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 
 ------- =_aaaaaaaaaa0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset="iso-8859-1"; name="square.txt"
+Content-Type: text/plain; charset="iso-8859-1"; name="nul+square.txt"

 Content-Transfer-Encoding: base64
 
 Content-Transfer-Encoding: base64
 

-Db2yPbwK
+AL2yPbwK

 
 ------- =_aaaaaaaaaa0--
 EOF
 
 cp -p `mhpath last` "$expected"
 
 ------- =_aaaaaaaaaa0--
 EOF
 
 cp -p `mhpath last` "$expected"

-set +e
-mhfixmsg last
-set -e
+run_prog mhfixmsg last

 check `mhpath last` "$expected" 'keep first'
 
 
 check `mhpath last` "$expected" 'keep first'
 
 


@@ -588,7 +588,7 @@ MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa0\"
 
 ------- =_aaaaaaaaaa0
 Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa0\"
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset=\"iso-8859-1\"; name=\"square.txt\"
+Content-Type: text/plain; charset=\"iso-8859-1\"; name=\"nul+square.txt\"

 Content-Transfer-Encoding: binary
 
 " "
 Content-Transfer-Encoding: binary
 
 " "


@@ -603,7 +603,7 @@ rmm last
 
 
 # check that -reformat succeeds when decode of binary text fails
 
 
 # check that -reformat succeeds when decode of binary text fails

-cat >"$expected" <<'EOF'
+prepare_space >"$expected" <<'EOF'

 MIME-Version: 1.0
 Date: Thu, 11 Apr 2013 02:47:08 -0700
 To: <me@example.com>
 MIME-Version: 1.0
 Date: Thu, 11 Apr 2013 02:47:08 -0700
 To: <me@example.com>


@@ -663,10 +663,10 @@ d><td align=3D"right"><font face=3D"Arial, Helvetica, sans-serif" color=3D"=
 EOF
 
 if [ $can_reformat_texthtml -eq 1 ]; then
 EOF
 
 if [ $can_reformat_texthtml -eq 1 ]; then

-  #### lynx inserts multiple blank lines, so use uniq to squeeze them.
+  #### lynx inserts multiple blank lines, so squeeze them.

   #### Truncate to avoid comparing the html portion because it can
   #### get reformatted.
   #### Truncate to avoid comparing the html portion because it can
   #### get reformatted.

-  mhfixmsg last -outfile - | uniq | head -22 >"$actual"
+  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"
   check "$expected" "$actual" 'ignore space'
 else
   cp -p "$MH_TEST_DIR/Mail/inbox/15" "$MH_TEST_DIR/Mail/inbox/15.backup"


@@ -674,13 +674,13 @@ else
 fi
 
 
 fi
 
 

-# check -textcodeset
+# check -textcharset

 # Also checks preservation of attributes after one (charset) that is
 # modified.
 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com
 # Also checks preservation of attributes after one (charset) that is
 # modified.
 cat >"$expected" <<EOF
 To: recipient@example.com
 From: sender@example.com

-Subject: mhfixmsg textcodeset test
+Subject: mhfixmsg textcharset test

 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 


@@ -699,7 +699,7 @@ EOF
 cat >`mhpath new` <<EOF
 To: recipient@example.com
 From: sender@example.com
 cat >`mhpath new` <<EOF
 To: recipient@example.com
 From: sender@example.com

-Subject: mhfixmsg textcodeset test
+Subject: mhfixmsg textcharset test

 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 


@@ -713,17 +713,13 @@ vbI9vAo=
 ------- =_aaaaaaaaaa0--
 EOF
 
 ------- =_aaaaaaaaaa0--
 EOF
 

-set +e
-mhfixmsg last -textcodeset utf-8 -outfile "$actual" 2>"$actual.err"
-if grep "mhfixmsg: Can't convert .* to .* without iconv" "$actual.err" \
-  >/dev/null; then
-  echo "$0: 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"
   check "$expected" "$actual"

-  rm "$actual.err"
+else
+  echo "$0: skipping -textcharset check because nmh was built without iconv"
+  rm -f "$expected"

 fi
 fi

-set -e

 
 
 # check -nofixboundary
 
 
 # check -nofixboundary


@@ -757,7 +753,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
 
 
 # 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
 check "$expected" "$actual"
 if grep "mhfixmsg: $MH_TEST_DIR/Mail/.*, fix multipart boundary" \
    "$actual.err" >/dev/null; then


@@ -774,7 +770,7 @@ fi
 cat >"$expected" <<EOF
 Date: Fri, 13 May 2011 08:21:12 -0500
 Content-Type: multipart/alternative;
 cat >"$expected" <<EOF
 Date: Fri, 13 May 2011 08:21:12 -0500
 Content-Type: multipart/alternative;

-        boundary="----=_NextPart_000_1781A1A_01CC1147.81EBA8D4"
+       boundary="----=_NextPart_000_1781A1A_01CC1147.81EBA8D4"

 Content-Transfer-Encoding: 8bit
 MIME-Version: 1.0
 From: <sender@example.com>
 Content-Transfer-Encoding: 8bit
 MIME-Version: 1.0
 From: <sender@example.com>


@@ -797,7 +793,7 @@ check "$expected" "$actual"
 
 
 # check that text/plain part is added to lone text/html in multipart/related
 
 
 # check that text/plain part is added to lone text/html in multipart/related

-cat >"$expected" <<EOF
+prepare_space >"$expected" <<EOF

 MIME-Version: 1.0
 Date: Tue, 26 Feb 2013 18:07:20 -0600
 Subject: multipart/related, not /alternative
 MIME-Version: 1.0
 Date: Tue, 26 Feb 2013 18:07:20 -0600
 Subject: multipart/related, not /alternative


@@ -865,9 +861,9 @@ Your email client does not support HTML messages
 EOF
 
 if [ $can_reformat_texthtml -eq 1 ]; then
 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"
+  #### 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
 else
   rm -f "$expected"
 fi


@@ -959,12 +955,12 @@ There are two CR-LF pairs at the end of this sentence.
 \r
 EOF
 
 \r
 EOF
 

-mhfixmsg last -outfile "$actual"
+run_prog mhfixmsg last -outfile "$actual"

 check "$expected" "$actual"
 
 
 # check -replacetextplain
 check "$expected" "$actual"
 
 
 # check -replacetextplain

-cat >"$expected" <<EOF
+prepare_space >"$expected" <<EOF

 To: recipient@example.com
 From: sender@example.com
 Subject: mhfixmsg replacement of bad text/plain part test
 To: recipient@example.com
 From: sender@example.com
 Subject: mhfixmsg replacement of bad text/plain part test


@@ -1024,9 +1020,10 @@ Content-Disposition: inline
 EOF
 
 if [ $can_reformat_texthtml -eq 1 ]; then
 EOF
 
 if [ $can_reformat_texthtml -eq 1 ]; then

-  #### lynx inserts multiple blank lines, so use uniq to squeeze them.
-  mhfixmsg last -replacetextplain -outfile - | uniq > "$actual"
-  check "$expected" "$actual"
+  #### 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
 else
   rm -f "$expected"
 fi


@@ -1063,7 +1060,7 @@ Content-Disposition: inline
 ------=_Part_876302--
 EOF
 
 ------=_Part_876302--
 EOF
 

-mhfixmsg last -replacetextplain -noreplacetextplain -outfile "$actual"
+run_prog mhfixmsg last -replacetextplain -noreplacetextplain -outfile "$actual"

 check "$expected" "$actual"
 
 
 check "$expected" "$actual"