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 759c8ed..ae613d9 100644 (file)
--- a/test/tests/mhbuild/test-forw
+++ b/test/tests/mhbuild/test-forw
@@ -5,39 +5,25 @@
 #
 ######################################################
 
-# 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: +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: +sent
@@ -68,10 +54,4 @@ Subject: Testing message 2
 This is message number 2
 
 ------- =_aaaaaaaaaa0--
-EOF
-mkdraft
-mhbuild $draft
-mungedraft
-check
-
-exit $failed
+!