1 files changed, 151 insertions, 5 deletions
diff --git a/libproto/dotmail/tests/append.at b/libproto/dotmail/tests/append.at
index a474edf61..e8950db73 100644
--- a/libproto/dotmail/tests/append.at
+++ b/libproto/dotmail/tests/append.at
@@ -12,10 +12,10 @@
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. 
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
 DM_MESG([append],
-[Received: (from hare@wonder.land) 
+[Received: (from hare@wonder.land)
 	by wonder.land id 3301
 	for alice@wonder.land; Mon, 29 Jul 2002 22:00:06 +0100
 Date: Mon, 29 Jul 2002 22:00:01 +0100
@@ -27,7 +27,7 @@ Return-Path: hare@wonder.land
 
 Have some wine
 .
-Received: (from alice@wonder.land) 
+Received: (from alice@wonder.land)
 	by wonder.land id 3302
 	for hare@wonder.land; Mon, 29 Jul 2002 22:00:07 +0100
 Date: Mon, 29 Jul 2002 22:00:02 +0100
@@ -39,7 +39,7 @@ Return-Path: alice@wonder.land
 
 I don't see any wine
 .
-Received: (from hare@wonder.land) 
+Received: (from hare@wonder.land)
 	by wonder.land id 3303
 	for alice@wonder.land; Mon, 29 Jul 2002 22:00:08 +0100
 Date: Mon, 29 Jul 2002 22:00:03 +0100
@@ -53,7 +53,7 @@ There isn't any
 .
 ],
 [AT_DATA([msg],
-[Received: (from alice@wonder.land) 
+[Received: (from alice@wonder.land)
 	by wonder.land id 3304
 	for hare@wonder.land; Mon, 29 Jul 2002 22:00:09 +0100
 Date: Mon, 29 Jul 2002 22:00:04 +0100
@@ -62,6 +62,7 @@ Message-Id: <200207292200.3304@wonder.land>
 To: March Hare  <hare@wonder.land>
 Subject: Re: Invitation
 Return-Path: alice@wonder.land
+X-UID: 1034
 
 Then it wasn't very civil of you to offer it
 ])],
@@ -73,6 +74,7 @@ append msg
 # Check if it is scanned and loaded
 env_date
 env_sender
+headers
 body_text
 ],
 
@@ -80,7 +82,151 @@ body_text
 4 current message
 4 env_date: Mon Jul 29 21:00:09 2002
 4 env_sender: alice@wonder.land
+4 headers: Received:(from alice@wonder.land) by wonder.land id 3304 for hare@wonder.land; Mon, 29 Jul 2002 22:00:09 +0100
+Date:Mon, 29 Jul 2002 22:00:04 +0100
+From:Alice  <alice@wonder.land>
+Message-Id:<200207292200.3304@wonder.land>
+To:March Hare  <hare@wonder.land>
+Subject:Re: Invitation
+Return-Path:alice@wonder.land
+
 4 body_text: Then it wasn't very civil of you to offer it
 
 4
 ])
+
+DM_MESG([append with uid],
+[Received: (from hare@wonder.land)
+	by wonder.land id 3301
+	for alice@wonder.land; Mon, 29 Jul 2002 22:00:06 +0100
+Date: Mon, 29 Jul 2002 22:00:01 +0100
+From: March Hare  <hare@wonder.land>
+Message-Id: <200207292200.3301@wonder.land>
+To: Alice  <alice@wonder.land>
+Subject: Invitation
+Return-Path: hare@wonder.land
+X-IMAPbase: 1027976406 140
+X-UID: 137
+
+Have some wine
+.
+Received: (from alice@wonder.land)
+	by wonder.land id 3302
+	for hare@wonder.land; Mon, 29 Jul 2002 22:00:07 +0100
+Date: Mon, 29 Jul 2002 22:00:02 +0100
+From: Alice  <alice@wonder.land>
+Message-Id: <200207292200.3302@wonder.land>
+To: March Hare  <hare@wonder.land>
+Subject: Re: Invitation
+Return-Path: alice@wonder.land
+X-UID: 138
+
+I don't see any wine
+.
+Received: (from hare@wonder.land)
+	by wonder.land id 3303
+	for alice@wonder.land; Mon, 29 Jul 2002 22:00:08 +0100
+Date: Mon, 29 Jul 2002 22:00:03 +0100
+From: March Hare  <hare@wonder.land>
+Message-Id: <200207292200.3303@wonder.land>
+To: Alice  <alice@wonder.land>
+Subject: Re: Invitation
+Return-Path: hare@wonder.land
+X-UID: 139
+
+There isn't any
+.
+],
+[AT_DATA([msg],
+[Received: (from alice@wonder.land)
+	by wonder.land id 3304
+	for hare@wonder.land; Mon, 29 Jul 2002 22:00:09 +0100
+Date: Mon, 29 Jul 2002 22:00:04 +0100
+From: Alice  <alice@wonder.land>
+Message-Id: <200207292200.3304@wonder.land>
+To: March Hare  <hare@wonder.land>
+Subject: Re: Invitation
+Return-Path: alice@wonder.land
+X-UID: 1034
+
+Then it wasn't very civil of you to offer it
+])],
+[dm_mbox count uidvalidity uidnext],
+[# Append new message
+append msg
+# Select it
+4
+# Check if it is scanned and loaded
+env_date
+env_sender
+headers
+body_text
+# Check the uidvalidity and uidnext
+uidvalidity
+uidnext
+sync
+],
+
+[append: OK
+4 current message
+4 env_date: Mon Jul 29 21:00:09 2002
+4 env_sender: alice@wonder.land
+4 headers: Received:(from alice@wonder.land) by wonder.land id 3304 for hare@wonder.land; Mon, 29 Jul 2002 22:00:09 +0100
+Date:Mon, 29 Jul 2002 22:00:04 +0100
+From:Alice  <alice@wonder.land>
+Message-Id:<200207292200.3304@wonder.land>
+To:March Hare  <hare@wonder.land>
+Subject:Re: Invitation
+Return-Path:alice@wonder.land
+X-UID:140
+
+4 body_text: Then it wasn't very civil of you to offer it
+
+uidvalidity: 1027976406
+uidnext: 141
+sync: OK
+4
+1027976406
+141
+])
+
+DM_MESG([append to empty mailbox],
+[],
+[AT_DATA([msg],
+[Received: (from hare@wonder.land)
+	by wonder.land id 3301
+	for alice@wonder.land; Mon, 29 Jul 2002 22:00:06 +0100
+Date: Mon, 29 Jul 2002 22:00:01 +0100
+From: March Hare  <hare@wonder.land>
+Message-Id: <200207292200.3301@wonder.land>
+To: Alice  <alice@wonder.land>
+Subject: Invitation
+Return-Path: hare@wonder.land
+
+Have some wine
+])],[],
+[# Append new message
+append msg
+# Select it
+1
+# Check if it is scanned and loaded
+env_date
+env_sender
+headers
+body_text
+],
+[append: OK
+1 current message
+1 env_date: Mon Jul 29 21:00:06 2002
+1 env_sender: hare@wonder.land
+1 headers: Received:(from hare@wonder.land) by wonder.land id 3301 for alice@wonder.land; Mon, 29 Jul 2002 22:00:06 +0100
+Date:Mon, 29 Jul 2002 22:00:01 +0100
+From:March Hare  <hare@wonder.land>
+Message-Id:<200207292200.3301@wonder.land>
+To:Alice  <alice@wonder.land>
+Subject:Invitation
+Return-Path:hare@wonder.land
+
+1 body_text: Have some wine
+
+])