Added Message-Id to messages in test suite.

[mmh] / test / mhbuild / test-forw

diff --git a/test/mhbuild/test-forw b/test/mhbuild/test-forw
index e9a1b2f..7326b51 100755 (executable)
--- a/test/mhbuild/test-forw
+++ b/test/mhbuild/test-forw
@@ -6,23 +6,14 @@
 ######################################################
 
 if test -z "${MH_OBJ_DIR}"; then
-    srcdir=`dirname $0`/../..
-    MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+    srcdir=`dirname "$0"`/../..
+    MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
 fi
 
 . "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
 
-# 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
-}
-
 # Make a draft file forwarding two messages.
 mkdraft() {
     cat > $draft <<EOF
@@ -35,15 +26,10 @@ Subject:
 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
+draft="$MH_TEST_DIR/$$.draft"
+draftorig="$MH_TEST_DIR/,$$.draft.orig"
+expected="$MH_TEST_DIR/$$.expected"
+actual="$MH_TEST_DIR/$$.actual"
 
 # check mhbuild
 cat > $expected <<EOF
@@ -53,7 +39,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
 Content-Description: forwarded messages
 
 ------- =_aaaaaaaaaa0
@@ -62,6 +47,7 @@ Content-Type: message/rfc822
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 
 This is message number 1
@@ -72,6 +58,7 @@ Content-Type: message/rfc822
 From: Test2 <test2@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 2@test.nmh
 Subject: Testing message 2
 
 This is message number 2
@@ -80,8 +67,8 @@ This is message number 2
 EOF
 mkdraft
 mhbuild $draft
-mungedraft
-check
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"
 
 # check mhbuild -rfc934
 cat > $expected <<EOF
@@ -91,7 +78,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
 Content-Description: forwarded messages
 
 
@@ -100,6 +86,7 @@ Content-Description: forwarded messages
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 
 This is message number 1
@@ -109,6 +96,7 @@ This is message number 1
 From: Test2 <test2@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 2@test.nmh
 Subject: Testing message 2
 
 This is message number 2
@@ -117,7 +105,7 @@ This is message number 2
 EOF
 mkdraft
 mhbuild -rfc934 $draft
-mungedraft
-check
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"
 
 exit $failed