You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2008/08/24 17:40:03 UTC

svn commit: r688520 - in /james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts: Rename.test SearchAtoms.test SearchCombinations.test UidSearchAtoms.test UidSearchCombinations.test

Author: bago
Date: Sun Aug 24 08:40:02 2008
New Revision: 688520

URL: http://svn.apache.org/viewvc?rev=688520&view=rev
Log:
Minor changes to tests to make them pass with both sun and geronimo implementations.
Geronimo is not happy when a mime stream starts with a space padded empty line.
Sun is not happy when an header has a newline just after the colon (it needs another space)

Modified:
    james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Rename.test
    james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test
    james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test
    james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test
    james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test

Modified: james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Rename.test
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Rename.test?rev=688520&r1=688519&r2=688520&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Rename.test (original)
+++ james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Rename.test Sun Aug 24 08:40:02 2008
@@ -630,8 +630,7 @@
 S: \* 9 EXISTS
 S: \* 9 RECENT
 S: A72 OK APPEND completed\.
-C: A73 APPEND testmailbox {12272+}
-C:                                                                                                                                                                                                                                                                                                        
+C: A73 APPEND testmailbox {11976+}
 C: Received: by 10.114.126.16 with HTTP; Tue, 11 Mar 2008 11:53:38 -0700 (PDT)
 C: Message-ID: <f4...@mail.gmail.com>
 C: Date: Tue, 11 Mar 2008 18:53:38 +0000
@@ -842,8 +841,7 @@
 S: \* 10 EXISTS
 S: \* 10 RECENT
 S: A73 OK APPEND completed\.
-C: A74 APPEND testmailbox {3661+}
-C:                                                                                                                                                                                                                                                                                                      
+C: A74 APPEND testmailbox {3367+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs68962wac;
 C:         Tue, 11 Mar 2008 11:41:47 -0700 (PDT)
@@ -937,8 +935,7 @@
 S: \* 11 EXISTS
 S: \* 11 RECENT
 S: A74 OK APPEND completed\.
-C: A75 APPEND testmailbox {4387+}
-C:                                                                                                                                                                                                                     
+C: A75 APPEND testmailbox {4174+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs69319wac;
 C:         Tue, 11 Mar 2008 11:45:12 -0700 (PDT)

Modified: james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test?rev=688520&r1=688519&r2=688520&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test (original)
+++ james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test Sun Aug 24 08:40:02 2008
@@ -270,9 +270,8 @@
 S: \* 9 EXISTS
 S: \* 9 RECENT
 S: A12 OK APPEND completed\.
-C: A13 APPEND testmailbox {12272+}
-C:                                                                                                                                                                                                                                                                                                        
-C: Received: by 10.114.126.16 with HTTP; Tue, 11 Mar 2008 11:53:38 -0700 (PDT)
+C: A13 APPEND testmailbox {11976+}
+C: Received: by 11.114.126.16 with HTTP; Tue, 11 Mar 2008 11:53:38 -0700 (PDT)
 C: Message-ID: <f4...@mail.gmail.com>
 C: Date: Tue, 11 Mar 2008 18:53:38 +0000
 C: From: "Robert Burrell Donkin" <ro...@gmail.com>
@@ -482,8 +481,7 @@
 S: \* 10 EXISTS
 S: \* 10 RECENT
 S: A13 OK APPEND completed\.
-C: A14 APPEND testmailbox {3661+}
-C:                                                                                                                                                                                                                                                                                                      
+C: A14 APPEND testmailbox {3367+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs68962wac;
 C:         Tue, 11 Mar 2008 11:41:47 -0700 (PDT)
@@ -577,8 +575,7 @@
 S: \* 11 EXISTS
 S: \* 11 RECENT
 S: A14 OK APPEND completed\.
-C: A15 APPEND testmailbox {4387+}
-C:                                                                                                                                                                                                                     
+C: A15 APPEND testmailbox {4174+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs69319wac;
 C:         Tue, 11 Mar 2008 11:45:12 -0700 (PDT)
@@ -736,7 +733,7 @@
 S: \* 16 EXISTS
 S: \* 16 RECENT
 S: A19 OK APPEND completed\.
-C: A20 APPEND testmailbox {14862+}
+C: A20 APPEND testmailbox {14853+}
 C: Return-Path: <ro...@gmail.com>
 C: Received: (qmail 16059 invoked from network); 11 Mar 2008 18:54:16 -0000
 C: Received: from unknown (HELO pre-smtp34-01.prod.mesa1.secureserver.net)
@@ -785,8 +782,7 @@
 C: Sender: Google Calendar <ca...@google.com>
 C: Received: by 10.35.108.12 with SMTP id k12mr18969364pym.3.1205261618449;
 C:         Tue,  11 Mar 2008 11:53:38 -0700 (PDT)
-C: Subject:
-C:         =?windows-1256?Q?=5BInvitation=5D_ApacheCon_Europe_2008=21_=40_Mon_7_Apr_=96_?=
+C: Subject: =?windows-1256?Q?=5BInvitation=5D_ApacheCon_Europe_2008=21_=40_Mon_7_Apr_=96_?=
 C:         =?windows-1256?Q?Fri_11_Apr_2008_=28=29?=
 C: From: Robert Burrell Donkin <ro...@gmail.com>
 C: To: rdonkin@apache.org
@@ -1843,8 +1839,8 @@
 S: A124 OK SEARCH completed\.
 C: A125 SEARCH SUBJECT o
 # TODO: JavaMail's parsing is buggy. Replace with Mime4J.
-# S: \* SEARCH 6 7 10 12 17 18 19
-S: \* SEARCH 6 7 10 12 18 19
+S: \* SEARCH 6 7 10 12 17 18 19
+# S: \* SEARCH 6 7 10 12 18 19
 S: A125 OK SEARCH completed\.
 C: A126 SEARCH SUBJECT the
 S: \* SEARCH

Modified: james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test?rev=688520&r1=688519&r2=688520&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test (original)
+++ james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test Sun Aug 24 08:40:02 2008
@@ -270,8 +270,7 @@
 S: \* 9 EXISTS
 S: \* 9 RECENT
 S: A12 OK APPEND completed\.
-C: A13 APPEND testmailbox {12272+}
-C:                                                                                                                                                                                                                                                                                                        
+C: A13 APPEND testmailbox {11976+}
 C: Received: by 10.114.126.16 with HTTP; Tue, 11 Mar 2008 11:53:38 -0700 (PDT)
 C: Message-ID: <f4...@mail.gmail.com>
 C: Date: Tue, 11 Mar 2008 18:53:38 +0000
@@ -482,8 +481,7 @@
 S: \* 10 EXISTS
 S: \* 10 RECENT
 S: A13 OK APPEND completed\.
-C: A14 APPEND testmailbox {3661+}
-C:                                                                                                                                                                                                                                                                                                      
+C: A14 APPEND testmailbox {3367+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs68962wac;
 C:         Tue, 11 Mar 2008 11:41:47 -0700 (PDT)
@@ -577,8 +575,7 @@
 S: \* 11 EXISTS
 S: \* 11 RECENT
 S: A14 OK APPEND completed\.
-C: A15 APPEND testmailbox {4387+}
-C:                                                                                                                                                                                                                     
+C: A15 APPEND testmailbox {4173+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs69319wac;
 C:         Tue, 11 Mar 2008 11:45:12 -0700 (PDT)

Modified: james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test?rev=688520&r1=688519&r2=688520&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test (original)
+++ james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test Sun Aug 24 08:40:02 2008
@@ -630,8 +630,7 @@
 S: \* 9 EXISTS
 S: \* 9 RECENT
 S: A72 OK APPEND completed\.
-C: A73 APPEND testmailbox {12272+}
-C:                                                                                                                                                                                                                                                                                                        
+C: A73 APPEND testmailbox {11976+}
 C: Received: by 10.114.126.16 with HTTP; Tue, 11 Mar 2008 11:53:38 -0700 (PDT)
 C: Message-ID: <f4...@mail.gmail.com>
 C: Date: Tue, 11 Mar 2008 18:53:38 +0000
@@ -842,8 +841,7 @@
 S: \* 10 EXISTS
 S: \* 10 RECENT
 S: A73 OK APPEND completed\.
-C: A74 APPEND testmailbox {3661+}
-C:                                                                                                                                                                                                                                                                                                      
+C: A74 APPEND testmailbox {3367+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs68962wac;
 C:         Tue, 11 Mar 2008 11:41:47 -0700 (PDT)
@@ -937,8 +935,7 @@
 S: \* 11 EXISTS
 S: \* 11 RECENT
 S: A74 OK APPEND completed\.
-C: A75 APPEND testmailbox {4387+}
-C:                                                                                                                                                                                                                     
+C: A75 APPEND testmailbox {4174+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs69319wac;
 C:         Tue, 11 Mar 2008 11:45:12 -0700 (PDT)
@@ -1096,7 +1093,7 @@
 S: \* 16 EXISTS
 S: \* 16 RECENT
 S: A79 OK APPEND completed\.
-C: A80 APPEND testmailbox {14862+}
+C: A80 APPEND testmailbox {14863+}
 C: Return-Path: <ro...@gmail.com>
 C: Received: (qmail 16059 invoked from network); 11 Mar 2008 18:54:16 -0000
 C: Received: from unknown (HELO pre-smtp34-01.prod.mesa1.secureserver.net)
@@ -1145,7 +1142,7 @@
 C: Sender: Google Calendar <ca...@google.com>
 C: Received: by 10.35.108.12 with SMTP id k12mr18969364pym.3.1205261618449;
 C:         Tue,  11 Mar 2008 11:53:38 -0700 (PDT)
-C: Subject:
+C: Subject: 
 C:         =?windows-1256?Q?=5BInvitation=5D_ApacheCon_Europe_2008=21_=40_Mon_7_Apr_=96_?=
 C:         =?windows-1256?Q?Fri_11_Apr_2008_=28=29?=
 C: From: Robert Burrell Donkin <ro...@gmail.com>
@@ -2203,9 +2200,7 @@
 S: \* SEARCH 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
 S: A184 OK SEARCH completed\.
 C: A185 UID SEARCH SUBJECT o
-# TODO: JavaMail's parsing is buggy. Replace with Mime4J.
-# S: \* SEARCH 26 27 30 32 37 38 39
-S: \* SEARCH 26 27 30 32 38 39
+S: \* SEARCH 26 27 30 32 37 38 39
 S: A185 OK SEARCH completed\.
 C: A186 UID SEARCH SUBJECT the
 S: \* SEARCH

Modified: james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test?rev=688520&r1=688519&r2=688520&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test (original)
+++ james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test Sun Aug 24 08:40:02 2008
@@ -630,8 +630,7 @@
 S: \* 9 EXISTS
 S: \* 9 RECENT
 S: A72 OK APPEND completed\.
-C: A73 APPEND testmailbox {12272+}
-C:                                                                                                                                                                                                                                                                                                        
+C: A73 APPEND testmailbox {11976+}
 C: Received: by 10.114.126.16 with HTTP; Tue, 11 Mar 2008 11:53:38 -0700 (PDT)
 C: Message-ID: <f4...@mail.gmail.com>
 C: Date: Tue, 11 Mar 2008 18:53:38 +0000
@@ -842,8 +841,7 @@
 S: \* 10 EXISTS
 S: \* 10 RECENT
 S: A73 OK APPEND completed\.
-C: A74 APPEND testmailbox {3661+}
-C:                                                                                                                                                                                                                                                                                                      
+C: A74 APPEND testmailbox {3367+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs68962wac;
 C:         Tue, 11 Mar 2008 11:41:47 -0700 (PDT)
@@ -937,8 +935,7 @@
 S: \* 11 EXISTS
 S: \* 11 RECENT
 S: A74 OK APPEND completed\.
-C: A75 APPEND testmailbox {4387+}
-C:                                                                                                                                                                                                                     
+C: A75 APPEND testmailbox {4174+}
 C: Delivered-To: robertburrelldonkin@gmail.com
 C: Received: by 10.114.126.16 with SMTP id y16cs69319wac;
 C:         Tue, 11 Mar 2008 11:45:12 -0700 (PDT)



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org