fmt_scan() no longer subtracts 1 from the width. This has the effect

[nmh] / test / inc / test-inc-scanout

diff --git a/test/inc/test-inc-scanout b/test/inc/test-inc-scanout
index ffe2c46da8f26e81e29980d12140a4b523ba5727..1d8145496b9af20b23c4144b9deed07103457029 100755 (executable)
--- a/test/inc/test-inc-scanout
+++ b/test/inc/test-inc-scanout
@@ -191,13 +191,13 @@ EOF
 run_test "inc -file ${MH_TEST_DIR}/test.mbox -width 120 -truncate" \
        "Incorporating new mail into inbox...
 
 run_test "inc -file ${MH_TEST_DIR}/test.mbox -width 120 -truncate" \
        "Incorporating new mail into inbox...
 

-  11+ 03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And why not, the man's entitled to it. Cos"
+  11+ 03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And why not, the man's entitled to it. Cost"

 
 check `mhpath +inbox 11` "${MH_TEST_DIR}/test.mbox.2" "keep first"
 rm -f "${MH_TEST_DIR}/test.mbox" "${MH_TEST_DIR}/test.mbox.2"
 
 run_test "scan -width 120 +inbox 11" \
 
 check `mhpath +inbox 11` "${MH_TEST_DIR}/test.mbox.2" "keep first"
 rm -f "${MH_TEST_DIR}/test.mbox" "${MH_TEST_DIR}/test.mbox.2"
 
 run_test "scan -width 120 +inbox 11" \

-       "  11+ 03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And why not, the man's entitled to it. Cos"
+       "  11+ 03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And why not, the man's entitled to it. Cost"

 
 # check header field name with ':' character than lands on m_getfld() buffer
 cat >"$MH_TEST_DIR/mess" <<EOF
 
 # check header field name with ':' character than lands on m_getfld() buffer
 cat >"$MH_TEST_DIR/mess" <<EOF


@@ -297,6 +297,42 @@ run_test 'scan -width 80 -file '"$MH_TEST_DIR"'/mess' \
          '   1  01/16 No Such User       FLDPLUS test'
 rm -f "$MH_TEST_DIR/mess"
 
          '   1  01/16 No Such User       FLDPLUS test'
 rm -f "$MH_TEST_DIR/mess"
 

+# check inc of message with header field body with more than 511 characters
+cat >"$expected" <<EOF
+Comments: The important characteristic of this message is that this header
+          field body is more than 511 bytes long.  That tests the logic in
+          m_getfld () for transitioning to the FLDPLUS state.  This is the
+          only use for the FLDPLUS state, handling header field bodies that
+          are longer than the buffer used to retrieve them.  The trailing
+          newline after the last character is the 512th character.  The 511th
+          character, counting all spaces, even the leading one, is*
+          And, it continues onto this line.
+From: No Such User <nosuch@example.com>
+To: Some Other User <someother@example.com>
+Subject: FLDPLUS test
+Date: Wed, 16 Jan 2013 20:33:58 -0600
+EOF
+
+cat >"$MH_TEST_DIR/mess" <<EOF
+From nosuch@example.com  Wed 16 Jan 2013 20:33:58 -0600
+Comments: The important characteristic of this message is that this header
+          field body is more than 511 bytes long.  That tests the logic in
+          m_getfld () for transitioning to the FLDPLUS state.  This is the
+          only use for the FLDPLUS state, handling header field bodies that
+          are longer than the buffer used to retrieve them.  The trailing
+          newline after the last character is the 512th character.  The 511th
+          character, counting all spaces, even the leading one, is*
+          And, it continues onto this line.
+From: No Such User <nosuch@example.com>
+To: Some Other User <someother@example.com>
+Subject: FLDPLUS test
+Date: Wed, 16 Jan 2013 20:33:58 -0600
+
+EOF
+run_prog inc -file "$MH_TEST_DIR/mess" >/dev/null
+check "$expected" `mhpath last`  ||  rmm last
+rm -f "$MH_TEST_DIR/mess"
+

 # check scan and inc of mbox with multiple messages
 echo y | packf -file "$MH_TEST_DIR/msgbox"
 run_test "scan -width 80 -file $MH_TEST_DIR/msgbox" \
 # check scan and inc of mbox with multiple messages
 echo y | packf -file "$MH_TEST_DIR/msgbox"
 run_test "scan -width 80 -file $MH_TEST_DIR/msgbox" \


@@ -310,7 +346,7 @@ run_test "scan -width 80 -file $MH_TEST_DIR/msgbox" \
    8  09/29 Test8              Testing message 8<<This is message number 8 >>
    9  09/29 Test9              Testing message 9<<This is message number 9 >>
   10  09/29 Test10             Testing message 10<<This is message number 10 >>
    8  09/29 Test8              Testing message 8<<This is message number 8 >>
    9  09/29 Test9              Testing message 9<<This is message number 9 >>
   10  09/29 Test10             Testing message 10<<This is message number 10 >>

-  11  03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. An
+  11  03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And

   12  12/18 foo@example.edu    test'
 run_test "inc -width 80 -file $MH_TEST_DIR/msgbox -truncate" \
 'Incorporating new mail into inbox...
   12  12/18 foo@example.edu    test'
 run_test "inc -width 80 -file $MH_TEST_DIR/msgbox -truncate" \
 'Incorporating new mail into inbox...


@@ -325,9 +361,25 @@ run_test "inc -width 80 -file $MH_TEST_DIR/msgbox -truncate" \
   20  09/29 Test8              Testing message 8<<This is message number 8 >>
   21  09/29 Test9              Testing message 9<<This is message number 9 >>
   22  09/29 Test10             Testing message 10<<This is message number 10 >>
   20  09/29 Test8              Testing message 8<<This is message number 8 >>
   21  09/29 Test9              Testing message 9<<This is message number 9 >>
   22  09/29 Test10             Testing message 10<<This is message number 10 >>

-  23  03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. An
+  23  03/01 Mr Nobody          Who is on first?<<Abbott: Every dollar of it. And

   24  12/18 foo@example.edu    test'
 rm -f  "$MH_TEST_DIR/msgbox"
 
   24  12/18 foo@example.edu    test'
 rm -f  "$MH_TEST_DIR/msgbox"
 

+# check mbox with two blank lines between header and body
+cat >>"$MH_TEST_DIR/msgbox" <<EOF
+From 
+Date: Mon, 15 Apr 2013 21:02:12 -0500
+From: me@example.com
+
+
+test
+EOF
+
+run_test "inc -width 60 -file $MH_TEST_DIR/msgbox -truncate" \
+'Incorporating new mail into inbox...
+
+  25+ 04/15 me@example.com     <<test >>'
+rm -f  "$MH_TEST_DIR/msgbox"
+

 
 exit ${failed:-0}
 
 exit ${failed:-0}