Remove the #ifdef UK for the default scan format

[nmh] / test / scan / test-scan-multibyte

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 9dae456e670c18fc9eaedfef444065cfb2bbe24d..dc2a284c76e55d8bc31f935a814dd9560a7d40a1 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -26,8 +26,7 @@ if test "${MULTIBYTE_ENABLED}" -ne 1; then
     test_skip "configure did not detect multibyte support"
 fi
 
-require_locale en_US.utf8
-LC_ALL=en_US.UTF-8; export LC_ALL
+require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
 #
 # Create a test message with RFC 2047 headers we can scan
@@ -64,13 +63,15 @@ fi
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
+
+start_test 'RFC 2047 headers'
 if test "$width" -eq 3; then
 cat > "$expected" <<EOF
-  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are look
+  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki
 EOF
 elif test "$width" -eq 2; then
 cat > "$expected" <<EOF
-  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki
+  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are lookin
 EOF
 else
     echo "Unsupported width for UTF-8 test string: $width"
@@ -80,6 +81,7 @@ fi
 run_prog scan -width 80 +inbox 11 > $actual || exit 1
 check "$expected" "$actual"
 
+
 #
 # Check decoding with an invalid multibyte sequence.  We skip this test
 # if we don't have iconv support, since it requires converting from one
@@ -87,6 +89,7 @@ check "$expected" "$actual"
 # it's required for the test right after it.
 #
 
+start_test 'invalid multibyte sequence'
 cat >`mhpath new` <<EOF
 From: Test12 <test12@example.com>
 To: Some User <user@example.com>
@@ -105,7 +108,7 @@ if test "$ICONV_ENABLED" -eq 1; then
 EOF
 
     # Don't use run_prog here because it loses the environment setting.
-    LC_ALL=C scan -width 75 last >"$actual"
+    LC_ALL=C scan -width 74 last >"$actual"
     check "$expected" "$actual"
 fi
 
@@ -121,6 +124,7 @@ if test $? -ne 0; then
 fi
 
 # check scan width with a valid multibyte sequence
+start_test 'scan width with a valid multibyte sequence'
 if test "$width" -eq 1; then
     cat >"$expected" <<EOF
   12  12/31 Test12             2013 New Year’s Deals! Start the year right
@@ -133,13 +137,14 @@ else
     echo "Unsupported width for U+2019: $width"
 fi
 
-run_prog scan -width 75 last >"$actual"
+run_prog scan -width 74 last >"$actual"
 check "$expected" "$actual"
 
 
 if test "$ICONV_ENABLED" -eq 1; then
+  start_test 'encoded single quote'
   cat >"$expected" <<EOF
-  13  01/13 sender@example.co  <<The Subject: is an encoded single quote, 0x92.
+  13  01/13 sender@example.co  <<The Subject: is an encoded single quote, 0x92. 
 EOF
 
   cat >"${MH_TEST_DIR}/Mail/inbox/13" <<EOF
@@ -160,4 +165,23 @@ EOF
 fi
 
 
+start_test 'insufficient room for multicolumn character'
+#### This multibyte character requires 2 columns for display, but
+#### only 1 is availble.  cpstripped() used to get this wrong.
+
+cat >"$expected" <<EOF
+ 
+EOF
+
+cat >`mhpath new` <<EOF
+Mime-Version: 1.0
+
+在 Should not see any of this text
+EOF
+
+run_prog scan -format '%{body}' -width 1 last >"$actual"
+check "$expected" "$actual"
+
+
+finish_test
 exit $failed