Remove unused NCWD and NPWD #defines.

[nmh] / test / repl / test-convert

diff --git a/test/repl/test-convert b/test/repl/test-convert
index d2d398a7573d4aea62b536da354607731c475de4..f2792a69e33d1e2963536f952d71705806d976a2 100755 (executable)
--- a/test/repl/test-convert
+++ b/test/repl/test-convert
@@ -17,7 +17,7 @@ fi
 expected="$MH_TEST_DIR/test-convert$$.expected"
 actual=`mhpath +`/draft
 
-printf 'Local-Mailbox: recipient@example.com' >>"$MH"
+printf 'Local-Mailbox: recipient@example.com\n' >>"$MH"
 
 
 #### Make sure that this works with 7-bit encoding.
@@ -25,6 +25,7 @@ LC_ALL=C; export LC_ALL
 
 
 # check -convertarg with multiple parts and additional text in draft
+start_test '-convertarg with multiple parts and additional text in draft'
 cat >"$expected" <<'EOF'
 From: recipient@example.com
 To: sender@example.com
@@ -73,12 +74,61 @@ mhbuild "$actual"
 check "$actual" "$expected"
 
 
+# check that text is not quoted-printable encoded
+# This tests the setting of reply_ct->c_reqencoding and
+# (*text_plain_ct)->c_reqencoding in expand_pseudoheader().
+start_test "don't encode text as quoted-printable"
+cat >"$expected" <<'EOF'
+From: recipient@example.com
+To: sender@example.com
+cc: 
+Fcc: +outbox
+Subject: Re: test
+Comments: In-reply-to sender@example.com
+   message dated "Thu, 11 Dec 2014 08:19:02 -0600."
+MIME-Version: 1.0
+Content-Type: text/plain; charset="US-ASCII"
+
+sender@example.com writes:
+
+> This is a very, very, very, very, very, very, very, very, very, very, very, long line.
+EOF
+
+cat >`mhpath new` <<'EOF'
+From: sender@example.com
+To: recipient@example.com
+Subject: test
+Date: Thu, 11 Dec 2014 08:19:02 -0600
+Content-Type: multipart/mixed; boundary="_001_"
+MIME-Version: 1.0
+
+--_001_
+Content-Type: text/plain
+
+This is a very, very, very, very, very, very, very, very, very, very, very, long line.
+
+--_001_--
+EOF
+
+#### Just prefix the text with "> ".
+cp "${MH}" "${MH}.new"
+cat >>"${MH}.new" <<EOF
+mhbuild-convert-text: sed 's/^\(.\)/> \1/; s/^$/>/;' <%F
+EOF
+repl -filter mhl.replywithoutbody -convertarg text/plain '' \
+     -nowhatnowproc last
+MH="${MH}.new" mhbuild "$actual"
+rm "${MH}.new"
+check "$actual" "$expected"
+
+
 #### Make sure that this works with 8-bit encoding.
-require_locale en_US.utf-8 en_US.utf8
-LC_ALL=en_US.UTF-8; export LC_ALL
+finish_test
+require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
 
-# check -convertarg with multiple parts and no additional text in draft
+# check -convertarg with multiple parts, 7 bit
+start_test '-convertarg with multiple parts, 7 bit'
 cat >"$expected" <<'EOF'
 From: recipient@example.com
 To: sender@example.com
@@ -89,7 +139,6 @@ Comments: In-reply-to sender@example.com
    message dated "Thu, 11 Dec 2014 08:19:02 -0600."
 MIME-Version: 1.0
 Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: 8bit
 
 sender@example.com writes:
 
@@ -112,7 +161,7 @@ Content-Type: text/plain
 This is part 1.
 
 --_001_
-Content-Type: text/plain
+Content-Type: text/plain; charset="UTF-8"
 
 This is part 2.
 
@@ -124,7 +173,55 @@ mhbuild "$actual"
 check "$actual" "$expected"
 
 
+# check -convertarg with multiple parts, 8 bit
+start_test '-convertarg with multiple parts, 8 bit'
+cat >"$expected" <<'EOF'
+From: recipient@example.com
+To: sender@example.com
+cc: 
+Fcc: +outbox
+Subject: Re: test
+Comments: In-reply-to sender@example.com
+   message dated "Thu, 11 Dec 2014 08:19:02 -0600."
+MIME-Version: 1.0
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+sender@example.com writes:
+
+> This is part 1.
+
+> This is §2, with a non-ASCII character.
+EOF
+
+cat >`mhpath new` <<'EOF'
+From: sender@example.com
+To: recipient@example.com
+Subject: test
+Date: Thu, 11 Dec 2014 08:19:02 -0600
+Content-Type: multipart/mixed; boundary="_001_"
+MIME-Version: 1.0
+
+--_001_
+Content-Type: text/plain
+
+This is part 1.
+
+--_001_
+Content-Type: text/plain; charset="UTF-8"
+
+This is §2, with a non-ASCII character.
+
+--_001_--
+EOF
+
+repl -filter mhl.replywithoutbody -convertarg text/plain '' -nowhatnowproc last
+mhbuild "$actual"
+check "$actual" "$expected"
+
+
 # check message with text part in multipart/related
+start_test 'check message with text part in multipart/related'
 cat >"$expected" <<'EOF'
 From: recipient@example.com
 To: sender@example.com
@@ -135,7 +232,6 @@ Comments: In-reply-to sender@example.com
    message dated "."
 MIME-Version: 1.0
 Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: 8bit
 
 sender@example.com writes:
 
@@ -153,7 +249,7 @@ MIME-Version: 1.0
 Content-Type: multipart/related; type="text/plain"; boundary="_002_"
 
 --_002_
-Content-Type: text/plain
+Content-Type: text/plain; charset="UTF-8"
 
 This is a test.
 
@@ -168,6 +264,7 @@ check "$actual" "$expected"
 
 
 # check reply to calendar request
+start_test 'check reply to calendar request'
 cat >"$expected" <<'EOF'
 From: recipient@example.com
 To: sender@example.com
@@ -276,4 +373,5 @@ SIGNATURE=Recip mhbuild - <`mhpath +`/draft | egrep -v '^DTSTAMP:' >"$actual"
 check "$actual" "$expected"
 
 
+finish_test
 exit $failed