X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fforw%2Ftest-forw-digest;h=ff39dddcf280525bf3869be159972fba93502686;hb=a97c3e637eaf2e2f4ecd8cb93b11795afb980988;hp=9d62fc8a75c29b2d6b7e9f99731cec37b8add30f;hpb=027327f82f3672985aa02fb84e558341ca8b9a1f;p=mmh

diff --git a/test/forw/test-forw-digest b/test/forw/test-forw-digest
index 9d62fc8..ff39ddd 100755
--- a/test/forw/test-forw-digest
+++ b/test/forw/test-forw-digest
@@ -14,37 +14,106 @@ setup_test
 
 expected="${MH_TEST_DIR}/$$.expected"
 actual="${MH_TEST_DIR}/Mail/draft"
-from="Mr Test User <test@user.com>"
-to1="User One <userone@test.com>"
-to2="User Two <usertwo@test.com>"
-cc1="CC User One <ccuserone@test.com>"
-cc2="CC User Two <ccusertwo@test.com>"
-cc3="CC User Three <ccuserthree@test.com>"
-cc4="CC User Four <ccuserfour@test.com>"
+from="Mr Test User <test@example.com>"
+to1="User One <userone@example.com>"
+to2="User Two <usertwo@example.com>"
+cc1="CC User One <ccuserone@example.com>"
+cc2="CC User Two <ccusertwo@example.com>"
+cc3="CC User Three <ccuserthree@example.com>"
+cc4="CC User Four <ccuserfour@example.com>"
 fcc1="+nosuchmailbox"
 fcc2="+nosuchmailbox2"
 
+digestdate=`date "+%A, %e %b %Y"`
+
 cat > "$expected" <<EOF
-From: ${from}
-To: ${to1}, ${to2}
-cc: ${cc1},
-    ${cc2},
-    ${cc3},
-    ${cc4}
+From:     ${from}
+To:       ${to1},
+          ${to2}
+cc:       ${cc1},
+          ${cc2},
+          ${cc3},
+          ${cc4}
 Fcc: ${fcc1}, ${fcc2}
-Subject: foo
+Subject:  digest-test Digest V2 #3
+Reply-To: digest-test
 --------
+digest-test Digest	$digestdate
+		Volume 2 : Issue 3
+
+Today's Topics:
+
+------------------------------------------------------------
+
+EOF
+
+i=1
+while [ "$i" -le 6 ]
+do
+    filename=`mhpath +inbox $i`
+    cat $filename >> "$expected"
+    cat >> "$expected" <<EOF
+
+------------------------------
 
+EOF
+    i=`expr $i + 1`
+done
 
+cat >> "$expected" <<EOF
+End of digest-test Digest [Volume 2 Issue 3]
+********************************************
 EOF
 
 forw -editor true -from "${from}" -to "${to1}" -to "${to2}" \
     -cc "${cc1}" -cc "${cc2}" -cc "${cc3}" -cc "${cc4}" -fcc "${fcc1}" \
-    -fcc "${fcc2}" -width 60 -nowhatnowproc 1 \
+    -fcc "${fcc2}" -width 60 -issue 3 -volume 2 -nowhatnowproc \
     -digest digest-test +inbox 1-6 || exit 1
 
 check "${expected}" "${actual}"
 
-test "${failed:-0}" -eq 0 && rm "${form}"
+rm -f "${actual}"
+
+#
+# Once more, but taking some of the defaults
+#
+
+cat > "$expected" <<EOF
+From:     ${from}
+To:       digest-test Distribution: dist-digest-test;
+Subject:  This is a test
+Reply-To: digest-test
+--------
+digest-test Digest	${digestdate}
+		Volume 2 : Issue 4
+
+Today's Topics:
+
+------------------------------------------------------------
+
+EOF
+
+i=7
+while [ "$i" -le 8 ]
+do
+    filename=`mhpath +inbox $i`
+    cat $filename >> "$expected"
+    cat >> "$expected" <<EOF
+
+------------------------------
+
+EOF
+    i=`expr $i + 1`
+done
+
+cat >> "$expected" <<EOF
+End of digest-test Digest [Volume 2 Issue 4]
+********************************************
+EOF
+
+forw -editor true -from "${from}" -nowhatnowproc -digest digest-test \
+    -subject "This is a test" +inbox 7-8 || exit 1
+
+check "${expected}" "${actual}"
 
 exit $failed