Author: norman
Date: Wed Aug 10 11:15:17 2011
New Revision: 1156106
URL: http://svn.apache.org/viewvc?rev=1156106&view=rev
Log:
adjust test scripts to reflect changes which were introduced by the mime4j
upgrade. The output is still conform to the imap rfc
Modified:
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSimpleBodyStructure.test
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSingleMessage.test
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureEmbedded.test
Modified:
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSimpleBodyStructure.test
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSimpleBodyStructure.test?rev=1156106&r1=1156105&r2=1156106&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSimpleBodyStructure.test
(original)
+++
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSimpleBodyStructure.test
Wed Aug 10 11:15:17 2011
@@ -205,7 +205,7 @@ S: \)
S: A27 OK FETCH completed\.
C: A28 FETCH 1:* (BODY BODYSTRUCTURE)
S: \* 1 FETCH \(BODY \("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT"
8 0\) BODYSTRUCTURE \("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 8
0 NIL NIL NIL NIL\)\)
-S: \* 2 FETCH \(BODY \("TEXT" "PLAIN" \("charset" "iso-8859-1"\) NIL NIL
"7BIT" 192 6\) BODYSTRUCTURE \("TEXT" "PLAIN" \("charset" "iso-8859-1"\) NIL
NIL "7BIT" 192 6 NIL \("inline" NIL\) NIL NIL\)\)
+S: \* 2 FETCH \(BODY \("TEXT" "PLAIN" \("charset" "ISO-8859-1"\) NIL NIL
"7BIT" 192 6\) BODYSTRUCTURE \("TEXT" "PLAIN" \("charset" "ISO-8859-1"\) NIL
NIL "7BIT" 192 6 NIL \("inline" NIL\) NIL NIL\)\)
S: \* 3 FETCH \(BODY \("APPLICATION" "XHTML\+XML" \("e" "mc\*mc"\)
"<477345345@example\.org>" "Homage to 70's TV" "7BIT" 183\) BODYSTRUCTURE
\("APPLICATION" "XHTML\+XML" \("e" "mc\*mc"\) "<477345345@example\.org>"
"Homage to 70's TV" "7BIT" 183 "Q2hlY2sgSW50ZWdyaXR5IQ==" \("inline" \("foo"
"bar" "one" "1" "param" "value"\)\) \("en" "en-US" "en-CA"\)
"http://www.example.org/rhubard.html"\)\)
S: A28 OK FETCH completed\.
C: A29 DELETE testmailbox
Modified:
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSingleMessage.test
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSingleMessage.test?rev=1156106&r1=1156105&r2=1156106&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSingleMessage.test
(original)
+++
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchSingleMessage.test
Wed Aug 10 11:15:17 2011
@@ -18,7 +18,7 @@
################################################################
# BODY
C: f1 FETCH 1 (BODY)
-S: \* 1 FETCH \(BODY \(\"TEXT\" \"PLAIN\" \(\"charset\" \"us-ascii\"\) NIL NIL
\"7BIT\" 9 1\)\)
+S: \* 1 FETCH \(BODY \(\"TEXT\" \"PLAIN\" \(\"charset\" \"US-ASCII\"\) NIL NIL
\"7BIT\" 9 1\)\)
S: f1 OK FETCH completed.
# BODY[]
@@ -87,7 +87,7 @@ S: f6 OK FETCH completed.
# BODYSTRUCTURE
C: f7 FETCH 1 (BODYSTRUCTURE)
-S: \* 1 FETCH \(BODYSTRUCTURE \(\"TEXT\" \"PLAIN\" \(\"charset\"
\"us-ascii\"\) NIL NIL \"7BIT\" 9 1 NIL NIL NIL NIL\)\)
+S: \* 1 FETCH \(BODYSTRUCTURE \(\"TEXT\" \"PLAIN\" \(\"charset\"
\"US-ASCII\"\) NIL NIL \"7BIT\" 9 1 NIL NIL NIL NIL\)\)
S: f7 OK FETCH completed.
# ENVELOPE
@@ -160,7 +160,7 @@ S: f16 OK FETCH completed.
# FULL ( === FLAGS INTERNALDATE RFC822.SIZE ENVELOPE BODY )
C: f17 FETCH 1 (FULL)
-S: \* 1 FETCH \(FLAGS \(\\Recent \\Seen\) INTERNALDATE \".*\" RFC822\.SIZE 254
ENVELOPE \(\".*\" \"Test 01\" \(\(\"Fred Foobar\" NIL \"foobar\"
\"Blurdybloop\.COM\"\)\) \(\(\"Fred Foobar\" NIL \"foobar\"
\"Blurdybloop\.COM\"\)\) \(\(\"Fred Foobar\" NIL \"foobar\"
\"Blurdybloop\.COM\"\)\) \(\(NIL NIL \"mooch\" \"owatagu\.siam\.edu\"\)\) NIL
NIL NIL \"<B27397-0100000@Blurdybloop\.COM>\"\) BODY \(\"TEXT\" \"PLAIN\"
\(\"charset\" \"us-ascii\"\) NIL NIL \"7BIT\" 9 1\)\)
+S: \* 1 FETCH \(FLAGS \(\\Recent \\Seen\) INTERNALDATE \".*\" RFC822\.SIZE 254
ENVELOPE \(\".*\" \"Test 01\" \(\(\"Fred Foobar\" NIL \"foobar\"
\"Blurdybloop\.COM\"\)\) \(\(\"Fred Foobar\" NIL \"foobar\"
\"Blurdybloop\.COM\"\)\) \(\(\"Fred Foobar\" NIL \"foobar\"
\"Blurdybloop\.COM\"\)\) \(\(NIL NIL \"mooch\" \"owatagu\.siam\.edu\"\)\) NIL
NIL NIL \"<B27397-0100000@Blurdybloop\.COM>\"\) BODY \(\"TEXT\" \"PLAIN\"
\(\"charset\" \"US-ASCII\"\) NIL NIL \"7BIT\" 9 1\)\)
S: f17 OK FETCH completed.
# FAST ( === FLAGS INTERNALDATE RFC822.SIZE )
Modified:
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureEmbedded.test
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureEmbedded.test?rev=1156106&r1=1156105&r2=1156106&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureEmbedded.test
(original)
+++
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureEmbedded.test
Wed Aug 10 11:15:17 2011
@@ -552,7 +552,7 @@ S: Rhubard\?Custard\?
S: \)
S: A24 OK FETCH completed\.
C: A25 FETCH 1:* (BODY BODYSTRUCTURE)
-S: \* 1 FETCH \(BODY \(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL
"7BIT" 10 1\)\("APPLICATION" "OCTET-STREAM" NIL NIL NIL "BASE64"
16\)\("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 395 \("Thu, 14 Feb 2008 12:00:00
\+0000 \(GMT\)" "A Multipart Alternative Email" \(\("Timothy Tayler" NIL
"timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL "timothy"
"example\.org"\)\) \(\("Timothy Tayler" NIL "timothy" "example\.org"\)\)
\(\("Samual Smith" NIL "samual" "example\.org"\)\) NIL NIL NIL NIL\) \(\("TEXT"
"PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 10 1\)\("APPLICATION"
"OCTET-STREAM" NIL NIL NIL "7BIT" 23\) "ALTERNATIVE"\) 19\)\(\("IMAGE" "GIF"
NIL "238478934723847238947892374" "Bogus Image Data" "BASE64" 17\)\("MESSAGE"
"RFC822" NIL NIL NIL "7BIT" 579 \("Sat, 16 Feb 2008 12:00:00 \+0000 \(GMT\)"
"Another Example Email" \(\("Timothy Tayler" NIL "timothy" "example\.org"\)\)
\(\("Timothy Tayler" NIL "timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL
"timothy" "example\.org"\
)\) \(\("John Smith" NIL "john" "example\.org"\)\) NIL NIL NIL NIL\)
\(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 22 1\)\(\("TEXT"
"PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 18 1\)\("TEXT" "PLAIN"
\("charset" "us-ascii"\) NIL NIL "7BIT" 49 3\) "ALTERNATIVE"\) "MIXED"\) 30\)
"MIXED"\) "MIXED"\) BODYSTRUCTURE \(\("TEXT" "PLAIN" \("charset" "us-ascii"\)
NIL NIL "7BIT" 10 1 NIL NIL NIL NIL\)\("APPLICATION" "OCTET-STREAM" NIL NIL NIL
"BASE64" 16 NIL NIL NIL NIL\)\("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 395
\("Thu, 14 Feb 2008 12:00:00 \+0000 \(GMT\)" "A Multipart Alternative Email"
\(\("Timothy Tayler" NIL "timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL
"timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL "timothy"
"example\.org"\)\) \(\("Samual Smith" NIL "samual" "example\.org"\)\) NIL NIL
NIL NIL\) \(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 10 1 NIL
NIL NIL NIL\)\("APPLICATION" "OCTET-STREAM" NIL NIL NIL "7BIT" 23 NIL NIL NIL
NIL\) "ALT
ERNATIVE" \("boundary" "42"\) NIL NIL NIL\) 19 NIL NIL NIL NIL\)\(\("IMAGE"
"GIF" NIL "238478934723847238947892374" "Bogus Image Data" "BASE64" 17 NIL NIL
NIL NIL\)\("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 579 \("Sat, 16 Feb 2008
12:00:00 \+0000 \(GMT\)" "Another Example Email" \(\("Timothy Tayler" NIL
"timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL "timothy"
"example\.org"\)\) \(\("Timothy Tayler" NIL "timothy" "example\.org"\)\)
\(\("John Smith" NIL "john" "example\.org"\)\) NIL NIL NIL NIL\) \(\("TEXT"
"PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 22 1 NIL NIL NIL
NIL\)\(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 18 1 NIL NIL
NIL NIL\)\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 49 3 NIL NIL
NIL NIL\) "ALTERNATIVE" \("boundary" "3\.243F6A8885A308D3"\) NIL NIL NIL\)
"MIXED" \("boundary" "2\.50290787509"\) NIL NIL NIL\) 30 NIL NIL NIL NIL\)
"MIXED" \("boundary" "4\.66920160910299"\) NIL NIL NIL\) "MIXED" \("boundary"
"1729"\) NIL NIL NIL\)\)
+S: \* 1 FETCH \(BODY \(\("TEXT" "PLAIN" \("charset" "US-ASCII"\) NIL NIL
"7BIT" 10 1\)\("APPLICATION" "OCTET-STREAM" NIL NIL NIL "BASE64"
16\)\("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 395 \("Thu, 14 Feb 2008 12:00:00
\+0000 \(GMT\)" "A Multipart Alternative Email" \(\("Timothy Tayler" NIL
"timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL "timothy"
"example\.org"\)\) \(\("Timothy Tayler" NIL "timothy" "example\.org"\)\)
\(\("Samual Smith" NIL "samual" "example\.org"\)\) NIL NIL NIL NIL\) \(\("TEXT"
"PLAIN" \("charset" "US-ASCII"\) NIL NIL "7BIT" 10 1\)\("APPLICATION"
"OCTET-STREAM" NIL NIL NIL "7BIT" 23\) "ALTERNATIVE"\) 19\)\(\("IMAGE" "GIF"
NIL "238478934723847238947892374" "Bogus Image Data" "BASE64" 17\)\("MESSAGE"
"RFC822" NIL NIL NIL "7BIT" 579 \("Sat, 16 Feb 2008 12:00:00 \+0000 \(GMT\)"
"Another Example Email" \(\("Timothy Tayler" NIL "timothy" "example\.org"\)\)
\(\("Timothy Tayler" NIL "timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL
"timothy" "example\.org"\
)\) \(\("John Smith" NIL "john" "example\.org"\)\) NIL NIL NIL NIL\)
\(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 22 1\)\(\("TEXT"
"PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 18 1\)\("TEXT" "PLAIN"
\("charset" "us-ascii"\) NIL NIL "7BIT" 49 3\) "ALTERNATIVE"\) "MIXED"\) 30\)
"MIXED"\) "MIXED"\) BODYSTRUCTURE \(\("TEXT" "PLAIN" \("charset" "US-ASCII"\)
NIL NIL "7BIT" 10 1 NIL NIL NIL NIL\)\("APPLICATION" "OCTET-STREAM" NIL NIL NIL
"BASE64" 16 NIL NIL NIL NIL\)\("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 395
\("Thu, 14 Feb 2008 12:00:00 \+0000 \(GMT\)" "A Multipart Alternative Email"
\(\("Timothy Tayler" NIL "timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL
"timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL "timothy"
"example\.org"\)\) \(\("Samual Smith" NIL "samual" "example\.org"\)\) NIL NIL
NIL NIL\) \(\("TEXT" "PLAIN" \("charset" "US-ASCII"\) NIL NIL "7BIT" 10 1 NIL
NIL NIL NIL\)\("APPLICATION" "OCTET-STREAM" NIL NIL NIL "7BIT" 23 NIL NIL NIL
NIL\) "ALT
ERNATIVE" \("boundary" "42"\) NIL NIL NIL\) 19 NIL NIL NIL NIL\)\(\("IMAGE"
"GIF" NIL "238478934723847238947892374" "Bogus Image Data" "BASE64" 17 NIL NIL
NIL NIL\)\("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 579 \("Sat, 16 Feb 2008
12:00:00 \+0000 \(GMT\)" "Another Example Email" \(\("Timothy Tayler" NIL
"timothy" "example\.org"\)\) \(\("Timothy Tayler" NIL "timothy"
"example\.org"\)\) \(\("Timothy Tayler" NIL "timothy" "example\.org"\)\)
\(\("John Smith" NIL "john" "example\.org"\)\) NIL NIL NIL NIL\) \(\("TEXT"
"PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 22 1 NIL NIL NIL
NIL\)\(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 18 1 NIL NIL
NIL NIL\)\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 49 3 NIL NIL
NIL NIL\) "ALTERNATIVE" \("boundary" "3\.243F6A8885A308D3"\) NIL NIL NIL\)
"MIXED" \("boundary" "2\.50290787509"\) NIL NIL NIL\) 30 NIL NIL NIL NIL\)
"MIXED" \("boundary" "4\.66920160910299"\) NIL NIL NIL\) "MIXED" \("boundary"
"1729"\) NIL NIL NIL\)\)
S: A25 OK FETCH completed\.
C: A26 DELETE testmailbox
S: A26 OK DELETE completed\.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
