Rework in the test framework; updated and new tests

[mmh] / test / tests / mhbuild / test-forw

diff --git a/test/tests/mhbuild/test-forw b/test/tests/mhbuild/test-forw
index 1dece26..ae613d9 100644 (file)
--- a/test/tests/mhbuild/test-forw
+++ b/test/tests/mhbuild/test-forw
@@ -1,46 +1,32 @@
 #!/bin/sh
 ######################################################
 #
-# Test forwarding messages (including RFC-934 mode).
+# Test forwarding messages
 #
 ######################################################
 
-# TODO: Move to a common file tests can source; need more framework...
-failed=0
-check() {
-    diff -u $expected $actual
-    if [ $? -ne 0 ]; then
-        failed=$((failed + 1))
-    fi
-}
+. "$MH_TEST_COMMON"
 
-# Make a draft file forwarding two messages.
-mkdraft() {
-    cat > $draft <<EOF
+draft="$MH_TEST_DIR/mhbuild-$$.draft"
+
+
+cat >"$draft" <<!
 To:
-cc:
-Fcc: +outbox
+Cc:
+Fcc: +sent
 Subject:
 --------
 #forw [forwarded messages] +inbox 1 2
-EOF
-}
+!
 
-# Munge the Content-Id from the draft after mhbuild, so we have a reliable
-# value to check.
-mungedraft() {
-    sed 's/\(Content-ID:\) <[^>][^>]*>/\1 <TESTID>/' $draft > $actual
-}
 
-draft=$MH_TEST_DIR/$$.draft
-expected=$MH_TEST_DIR/$$.expected
-actual=$MH_TEST_DIR/$$.actual
+runandcheck 'mhbuild "$draft"' <<!
+!
 
-# check mhbuild
-cat > $expected <<EOF
+runandcheck 'sed "/^Content-ID/s/:.*/: <TESTID>/" "$draft"' <<!
 To:
-cc:
-Fcc: +outbox
+Cc:
+Fcc: +sent
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
@@ -68,47 +54,4 @@ Subject: Testing message 2
 This is message number 2
 
 ------- =_aaaaaaaaaa0--
-EOF
-mkdraft
-mhbuild $draft
-mungedraft
-check
-
-# check mhbuild -rfc934
-cat > $expected <<EOF
-To:
-cc:
-Fcc: +outbox
-Subject:
-MIME-Version: 1.0
-Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
-Content-Description: forwarded messages
-
-
-------- =_aaaaaaaaaa0
-
-From: Test1 <test1@example.com>
-To: Some User <user@example.com>
-Date: Fri, 29 Sep 2006 00:00:00
-Subject: Testing message 1
-
-This is message number 1
-
-------- =_aaaaaaaaaa0
-
-From: Test2 <test2@example.com>
-To: Some User <user@example.com>
-Date: Fri, 29 Sep 2006 00:00:00
-Subject: Testing message 2
-
-This is message number 2
-
-------- =_aaaaaaaaaa0--
-EOF
-mkdraft
-mhbuild -rfc934 $draft
-mungedraft
-check
-
-exit $failed
+!