X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/97d33c31f4d3fdef03610c1652b5e246184e0097..93a18dd7:/test/mhl/test-rfc6532?ds=sidebyside

diff --git a/test/mhl/test-rfc6532 b/test/mhl/test-rfc6532
index 978f291a..0c32a00e 100755
--- a/test/mhl/test-rfc6532
+++ b/test/mhl/test-rfc6532
@@ -22,11 +22,14 @@ mhl="${MH_LIBEXEC_DIR}/mhl"
 require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
 
-# check UTF-8 headers
 start_test 'UTF-8 headers'
-cat >"$MH_TEST_DIR"/Mail/inbox/11 <<EOF
-From: senderø@example.com
+#### The -- position the multibyte characters to check edge
+#### cases in the 'UTF-8 headers with narrow width' test below.
+cat >`mhpath new` <<EOF
+From: sender--ø@example.com
 To: recipientæ@example.com
+To: recipient2@example.com
+Cc: recip--æ@example.com
 Subject: Blåbærsyltetøy
 Date: 20 May 2014 14:28:51 +0200
 MIME-Version: 1.0
@@ -46,26 +49,62 @@ EOF
 #### squashes the trailing blank lines from mhl.
 run_test "$mhl -form mhl.headers `mhpath last`" \
 'Date:    20 May 2014 14:28:51 +0200
-To:      recipientæ@example.com
-From:    senderø@example.com
+To:      recipientæ@example.com,
+	 recipient2@example.com
+cc:      recip--æ@example.com
+From:    sender--ø@example.com
 Subject: Blåbærsyltetøy
 
 MIME-Version: 1.0'
 
 
-# check with incompatible locale
-# This is here as a place holder.  We should either try to run the (8-bit) text
-# through iconv, or refuse to display it if the locale is incompatible.  In the
-# case of EAI, that means not UTF-8.
-# start_test 'incompatible locale'
-# LC_ALL=C
-# run_test "$mhl -form mhl.headers `mhpath last`" \
-# 'Date:    20 May 2014 14:28:51 +0200
-# To:      recipientæ@example.com
-# From:    sender??@example.com
-# Subject: Bl??b??rsyltet??y
-#
-# MIME-Version: 1.0'
+start_test 'UTF-8 headers with narrow width'
+run_test "$mhl -form mhl.headers -width 18 `mhpath last`" \
+'Date:    20 May 2
+     ***014 14:28
+     ***:51 +0200
+To:      recipien
+     ***tæ@exampl
+     ***e.com,
+	 recipien
+     ***t2@exampl
+     ***e.com
+cc:      recip--æ
+     ***@example.
+     ***com
+From:    sender--
+     ***ø@example
+     ***.com
+Subject: Blåbærsy
+     ***ltetøy
+
+MIME-Version: 1.0'
+
+
+start_test 'incompatible locale'
+# Show that LC_CTYPE is sufficient, if LC_ALL is unset.
+unset LC_ALL
+LC_CTYPE=C; export LC_CTYPE
+cat >"$MH_TEST_DIR/test.format" <<EOF
+; Doesn't decode From: or Subject:, to be really sure
+; that character replacement works.
+overflowtext="***",overflowoffset=5
+leftadjust,compwidth=9
+Date:formatfield="%<(nodate{text})%{text}%|%(pretty{text})%>"
+To:
+cc:
+From:
+Subject:
+EOF
+
+run_test "$mhl -form "$MH_TEST_DIR/test.format" `mhpath last`" \
+'Date:    20 May 2014 14:28:51 +0200
+To:      recipient??@example.com,
+	 recipient2@example.com
+cc:      recip--??@example.com
+From:    sender--??@example.com
+Subject: Bl??b??rsyltet??y'
+rm -f "$MH_TEST_DIR/test.format"
 
 
 finish_test