Added test-mhparam and test-mhstore.

diff --git a/Makefile.am b/Makefile.am
index 7d8568f..bf7151e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,9 +51,11 @@ TESTS = test/bad-input/test-header \
        test/forw/test-forw-format \
        test/inc/test-deb359167 test/inc/test-eom-align \
        test/manpages/test-manpages test/mhbuild/test-forw \
-       test/mhlist/test-mhlist test/mhpath/test-mhpath \
+       test/mhlist/test-mhlist test/mhparam/test-mhparam \
+       test/mhpath/test-mhpath \
        test/mhshow/test-cte-binary test/mhshow/test-qp \
-       test/mhshow/test-subpart test/new/test-basic \
+       test/mhshow/test-subpart test/mhstore/test-mhstore \
+       test/new/test-basic \
        test/pick/test-pick test/pick/test-stderr \
        test/repl/test-if-str test/scan/test-scan \
        test/sequences/test-flist test/sequences/test-mark \

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
new file mode 100755 (executable)
index 0000000..6615748
--- /dev/null
+++ b/test/mhparam/test-mhparam
@@ -0,0 +1,101 @@
+#!/bin/sh
+######################################################
+#
+# Test mhparam
+#
+######################################################
+
+set -e
+
+if test -z "${MH_OBJ_DIR}"; then
+    srcdir=`dirname $0`/../..
+    MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+fi
+
+. "$MH_OBJ_DIR/test/common.sh"
+
+setup_test
+
+expected=$MH_TEST_DIR/$$.expected
+expected_err=$MH_TEST_DIR/$$.expected_err
+actual=$MH_TEST_DIR/$$.actual
+actual_err=$MH_TEST_DIR/$$.actual_err
+
+
+# check -help
+cat >$expected <<EOF
+Usage: mhparam [profile-components] [switches]
+  switches are:
+  -[no]components
+  -all
+  -version
+  -help
+EOF
+# The exit status is 1 with -help, so invert it to prevent
+# triggering immediate exit due to set -e.
+! mhparam -help >$actual 2>&1
+check $expected $actual
+
+# check -version
+if ! mhparam -v | grep '^mhparam --' >/dev/null; then
+  echo "$0: mhparam -v generated unexpected output" 1>&2
+  failed=`expr ${failed:-0} + 1`
+fi
+
+# check unknown option
+run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
+
+# check -all
+cp $MH_TEST_DIR/Mail/.mh_profile $expected
+# -all adds current folder
+echo 'Current-Folder: '`folder -f` >>$expected
+mhparam -all >$actual
+check $expected $actual 'keep first'
+
+# check -all with a component
+echo 'mhparam: profile-components ignored with -all' >$expected_err
+mhparam -all path >$actual 2>$actual_err
+check $expected $actual 'keep first'
+check $expected_err $actual_err
+
+# check -all with -components
+echo 'mhparam: -components ignored with -all' >$expected_err
+mhparam -all -components >$actual 2>$actual_err
+check $expected $actual
+check $expected_err $actual_err
+
+# check one component
+run_test 'mhparam path' "$MH_TEST_DIR/Mail"
+
+# check more than one component, which enables -component
+echo 'AliasFile: aliases' >>"$MH_TEST_DIR/Mail/.mh_profile"
+run_test 'mhparam path AliasFile' "path: $MH_TEST_DIR/Mail
+AliasFile: aliases"
+
+# check -component
+run_test 'mhparam -component Path' "Path: $MH_TEST_DIR/Mail"
+
+# check -component, note that component name of argument is echoed exactly
+run_test 'mhparam -component path' "path: $MH_TEST_DIR/Mail"
+run_test 'mhparam -component PATH' "PATH: $MH_TEST_DIR/Mail"
+
+# check -nocomponent
+run_test 'mhparam -component -nocomponent path' "$MH_TEST_DIR/Mail"
+run_test 'mhparam -nocomponent path AliasFile' "$MH_TEST_DIR/Mail
+aliases"
+
+# check nonexistent component
+run_test 'mhparam nonexistent' ''
+
+# check that return status counts nonexistent components
+set +e
+mhparam path context nonexistent1 nonexistent2 nonexistent3 >/dev/null
+run_test "echo $?" 3
+set -e
+
+# mhparam -debug (undocumented)
+# Some of its output depends on configure options, so don't bother to
+# check for correctness here.
+mhparam -debug >/dev/null
+
+exit $failed

diff --git a/test/mhstore/test-mhstore b/test/mhstore/test-mhstore
new file mode 100755 (executable)
index 0000000..52b92f7
--- /dev/null
+++ b/test/mhstore/test-mhstore
@@ -0,0 +1,243 @@
+#!/bin/sh
+######################################################
+#
+# Test mhstore
+#
+######################################################
+
+set -e
+
+if test -z "${MH_OBJ_DIR}"; then
+    srcdir=`dirname $0`/../..
+    MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+fi
+
+. "$MH_OBJ_DIR/test/common.sh"
+
+setup_test
+
+expected=$MH_TEST_DIR/$$.expected
+actual=$MH_TEST_DIR/$$.actual
+
+cd $MH_TEST_DIR
+
+# check with no options and no current message
+run_test 'mhstore' 'mhstore: no cur message'
+
+# check with no options and current message
+folder +inbox 5 > /dev/null
+cat > $expected <<EOF
+This is message number 5
+EOF
+run_test 'mhstore' 'storing message 5 as file 5.txt'
+check $expected 5.txt 'keep first'
+
+# check with folder and current message
+run_test 'mhstore +inbox' 'storing message 5 as file 5.txt'
+check $expected 5.txt 'keep first'
+
+# check with specified message
+run_test 'mhstore 5' 'storing message 5 as file 5.txt'
+check $expected 5.txt 'keep first'
+
+# check -file
+run_test "mhstore -file $MH_TEST_DIR/Mail/inbox/5" \
+  "storing message $MH_TEST_DIR/Mail/inbox/5 as file 5.txt"
+check $expected 5.txt 'keep first'
+
+# check -file -
+stored_contents=`mhstore -file - < $MH_TEST_DIR/Mail/inbox/5 2>&1 | \
+  sed 's/.*as file //'`
+check $expected $stored_contents
+
+# check message number greater than highest
+run_test 'mhstore 11' "mhstore: message 11 doesn't exist"
+
+# check multiple messages
+run_test 'mhstore 4 6' 'storing message 4 as file 4.txt
+storing message 6 as file 6.txt'
+cat > $expected <<EOF
+This is message number 4
+EOF
+check $expected 4.txt
+cat > $expected <<EOF
+This is message number 6
+EOF
+check $expected 6.txt
+
+# Write message with a text/plain subpart.
+msgfile=$(mhpath new)
+cat > $msgfile <<EOF
+To: recipient@example.com
+From: sender@example.com
+Subject: mhlist test
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+
+------- =_aaaaaaaaaa0
+Content-Type: multipart/related;
+    type="multipart/alternative";
+    boundary="subpart__1.1"
+
+--subpart__1.1
+Content-Type: text/plain; charset="us-ascii"
+Content-Disposition: attachment; filename="test1.txt"
+
+This is the first text/plain part, in a subpart.
+
+--subpart__1.1--
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii"
+Content-Disposition: attachment; filename="test2.txt"
+Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA==
+Content-Transfer-Encoding: quoted-printable
+
+This is the second text/plain part.
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii"
+Content-Disposition: attachment; filename="test3.txt"
+
+This is the third text/plain part.
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii"; name="test4.txt"
+Content-Disposition: attachment; filename="test4.txt"
+Content-Transfer-Encoding: base64
+
+VGhpcyBpcyB0aGUgZm91cnRoIHRleHQvcGxhaW4gcGFydC4K
+
+------- =_aaaaaaaaaa0--
+EOF
+
+# check -part
+cat > $expected <<EOF
+This is the third text/plain part.
+EOF
+run_test 'mhstore last -part 3' 'storing message 11 part 3 as file 11.3.txt'
+check $expected 11.3.txt
+
+# check -part of a subpart
+cat > $expected <<EOF
+This is the first text/plain part, in a subpart.
+EOF
+run_test 'mhstore last -part 1.1' \
+         'storing message 11 part 1.1 as file 11.1.1.txt'
+check $expected 11.1.1.txt 'keep first'
+
+# check -type
+run_test 'mhstore last -type text/plain' \
+  'storing message 11 part 1.1 as file 11.1.1.txt
+storing message 11 part 2 as file 11.2.txt
+storing message 11 part 3 as file 11.3.txt
+storing message 11 part 4 as file 11.4.txt'
+check $expected 11.1.1.txt
+cat > $expected <<EOF
+This is the second text/plain part.
+EOF
+check $expected 11.2.txt
+cat > $expected <<EOF
+This is the third text/plain part.
+EOF
+check $expected 11.3.txt
+cat > $expected <<EOF
+This is the fourth text/plain part.
+EOF
+check $expected 11.4.txt
+
+# check -auto
+cat > $expected <<EOF
+This is the fourth text/plain part.
+EOF
+run_test 'mhstore last -part 4 -auto' \
+  'storing message 11 part 4 as file test4.txt'
+check $expected test4.txt 'keep first'
+
+# check -noauto, the default
+run_test 'mhstore last -part 4 -auto -noauto' \
+  'storing message 11 part 4 as file 11.4.txt'
+check $expected 11.4.txt 'keep first'
+
+# check -verbose, which doesn't do anything
+run_test 'mhstore last -part 4 -verbose' \
+  'storing message 11 part 4 as file 11.4.txt'
+check $expected 11.4.txt 'keep first'
+
+# check -noverbose, the default
+run_test 'mhstore last -part 4 -verbose -noverbose' \
+  'storing message 11 part 4 as file 11.4.txt'
+check $expected 11.4.txt
+
+# check -check
+cat > $expected <<EOF
+This is the second text/plain part.
+EOF
+run_test 'mhstore last -part 2 -check' \
+         'storing message 11 part 2 as file 11.2.txt'
+check $expected 11.2.txt 'keep first'
+
+# check -check with bad MD5 checksum
+sed 's/\(Content-MD5: \)kq+Hnc/\1BADBAD/' $msgfile > $MH_TEST_DIR/$$.tmp
+mv -f $MH_TEST_DIR/$$.tmp $msgfile
+run_test 'mhstore last -part 2 -check' \
+'storing message 11 part 2 as file 11.2.txt
+mhstore: content integrity suspect (digest mismatch) -- continuing
+         (content text/plain in message 11, part 2)'
+check $expected 11.2.txt 'keep first'
+
+# check -nocheck, the default
+run_test 'mhstore last -part 2 -check -nocheck' \
+         'storing message 11 part 2 as file 11.2.txt'
+check $expected 11.2.txt
+
+# check reassembly of message/partial messages (RFC 1521, 7.3.2)
+msgfile=$(mhpath new)
+cat > $msgfile <<EOF
+To: recipient@example.com
+From: sender@example.com
+Subject: mhlist test
+MIME-Version: 1.0
+Content-Type: message/partial; id="test-mhstore message/partial test"; number=1
+
+Content-Type: text/plain; charset="us-ascii"
+
+This is part one of three.
+EOF
+
+msgfile=$(mhpath new)
+cat > $msgfile <<EOF
+To: recipient@example.com
+From: sender@example.com
+Subject: mhlist test
+MIME-Version: 1.0
+Content-Type: message/partial; id="test-mhstore message/partial test"; number=2
+
+This is part two of three.
+EOF
+
+msgfile=$(mhpath new)
+cat > $msgfile <<EOF
+To: recipient@example.com
+From: sender@example.com
+Subject: mhlist test
+MIME-Version: 1.0
+Content-Type: message/partial; id="test-mhstore message/partial test"; number=3;
+  total=3
+
+This is part three of three.
+EOF
+
+run_test 'mhstore last:3' \
+         'reassembling partials 12,13,14 to folder inbox as message 15'
+
+cat > $expected <<EOF
+This is part one of three.
+This is part two of three.
+This is part three of three.
+EOF
+run_test 'mhstore last' 'storing message 15 as file 15.txt'
+check $expected 15.txt
+
+
+exit $failed