Author: norman
Date: Thu Aug 11 18:45:04 2011
New Revision: 1156725
URL: http://svn.apache.org/viewvc?rev=1156725&view=rev
Log:
adjust tests for mime4j 0.7
Modified:
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchMultipartBodyStructure.test
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureComplex.test
Modified:
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchMultipartBodyStructure.test
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchMultipartBodyStructure.test?rev=1156725&r1=1156724&r2=1156725&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchMultipartBodyStructure.test
(original)
+++
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchMultipartBodyStructure.test
Thu Aug 11 18:45:04 2011
@@ -683,7 +683,7 @@ S: \)
S: A26 OK FETCH completed\.
C: A27 FETCH 1:* (BODY BODYSTRUCTURE)
S: \* 1 FETCH \(BODY \(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL
"7BIT" 781 17\)\("IMAGE" "PNG" \("name" "blob\.png"\) NIL NIL "BASE64"
492\)\("IMAGE" "PNG" \("name" "blob\.png"\) NIL NIL "BASE64" 492\)\("TEXT"
"PLAIN" \("charset" "us-ascii" "name" "rhubarb\.txt"\) NIL NIL
"QUOTED-PRINTABLE" 3193 41\) "MIXED"\) BODYSTRUCTURE \(\("TEXT" "PLAIN"
\("charset" "us-ascii"\) NIL NIL "7BIT" 781 17 NIL NIL NIL
"relative/license.txt"\)\("IMAGE" "PNG" \("name" "blob\.png"\) NIL NIL "BASE64"
492 NIL \("attachment" \("creation-date" "Sat, 20 Jun 2008 10:15:09 \+0000"
"filename" "blob\.png" "modification-date" "Sun, 21 Jun 2008 15:32:18 \+0000"
"read-date" "Mon, 22 Jun 2008 12:08:56 \+0000" "size" "482"\)\) NIL
"http://www.example.org/blob.png"\)\("IMAGE" "PNG" \("name" "blob\.png"\) NIL
NIL "BASE64" 492 NIL \("attachment" \("filename" "blob\.png"\)\) NIL
"http://www.example.org/blob.png"\)\("TEXT" "PLAIN" \("charset" "us-ascii"
"name" "rhubarb\.txt"\) NIL NIL "QUOTED-PRINTABLE" 3
193 41 NIL \("attachment" \("filename" "rhubarb\.txt"\)\) \("en" "en-US"
"en-CA" "en-AU"\)
"ftp://ftp.example.org/lots/lots/lots/lots/lots/lots/lots/lots/lots/lots/rhubard.txt"\)
"MIXED" \("boundary" "=-tIdGYVstQJghyEDATnJ\+"\) NIL NIL
"http://www.example.org/"\)\)
-S: \* 2 FETCH \(BODY \(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL
"7BIT" 15 1\)\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 18
1\)\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 16 1\)
"ALTERNATIVE"\) BODYSTRUCTURE \(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL
NIL "7BIT" 15 1 NIL NIL \("en" "en-US" "en-CA"\) NIL\)\("TEXT" "PLAIN"
\("charset" "us-ascii"\) NIL NIL "7BIT" 18 1 NIL NIL \("fr" "fr-Latn-CA"\)
NIL\)\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 16 1 NIL NIL
\("nl-BE"\) NIL\) "ALTERNATIVE" \("boundary" "1729"\) NIL NIL NIL\)\)
+S: \* 2 FETCH \(BODY \(\("TEXT" "PLAIN" \("charset" "US-ASCII"\) NIL NIL
"7BIT" 15 1\)\("TEXT" "PLAIN" \("charset" "US-ASCII"\) NIL NIL "7BIT" 18
1\)\("TEXT" "PLAIN" \("charset" "US-ASCII"\) NIL NIL "7BIT" 16 1\)
"ALTERNATIVE"\) BODYSTRUCTURE \(\("TEXT" "PLAIN" \("charset" "US-ASCII"\) NIL
NIL "7BIT" 15 1 NIL NIL \("en" "en-US" "en-CA"\) NIL\)\("TEXT" "PLAIN"
\("charset" "US-ASCII"\) NIL NIL "7BIT" 18 1 NIL NIL \("fr" "fr-Latn-CA"\)
NIL\)\("TEXT" "PLAIN" \("charset" "US-ASCII"\) NIL NIL "7BIT" 16 1 NIL NIL
\("nl-BE"\) NIL\) "ALTERNATIVE" \("boundary" "1729"\) NIL NIL NIL\)\)
S: A27 OK FETCH completed\.
C: A28 DELETE testmailbox
S: A28 OK DELETE completed\.
Modified:
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureComplex.test
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureComplex.test?rev=1156725&r1=1156724&r2=1156725&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureComplex.test
(original)
+++
james/mailbox-integration-tester/trunk/src/main/resources/org/apache/james/imap/scripts/FetchStructureComplex.test
Thu Aug 11 18:45:04 2011
@@ -3106,9 +3106,9 @@ S: \* 6 FETCH \(BODY\[4\.2\.2\.2\] \{0\}
S: \)
S: A130 OK FETCH completed\.
C: A131 FETCH 1:* (BODY BODYSTRUCTURE)
-S: \* 1 FETCH \(BODY \(\(\("TEXT" "PLAIN" \("charset" "iso-8859-1"\) NIL NIL
"7BIT" 775 19\)\("TEXT" "HTML" \("charset" "iso-8859-1"\) NIL NIL "7BIT" 1066
4\)\("TEXT" "CALENDAR" \("charset" "iso-8859-1" "method" "REQUEST" "name"
"invite\.ics"\) NIL NIL "7BIT" 2162 44\) "ALTERNATIVE"\)\("APPLICATION" "ICS"
\("name" "invite20080407T190000\.ics"\) NIL NIL "BASE64" 2958\)\("TEXT" "HTML"
\("charset" "us-ascii" "name" "sonnet\.html"\) NIL NIL "BASE64" 1124
14\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name" "sonnet\.txt"\) NIL NIL
"BASE64" 816 10\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name"
"another-sonnet\.txt"\) NIL NIL "BASE64" 816 10\) "MIXED"\) BODYSTRUCTURE
\(\(\("TEXT" "PLAIN" \("charset" "iso-8859-1"\) NIL NIL "7BIT" 775 19 NIL
\("inline" NIL\) NIL NIL\)\("TEXT" "HTML" \("charset" "iso-8859-1"\) NIL NIL
"7BIT" 1066 4 NIL \("inline" NIL\) NIL NIL\)\("TEXT" "CALENDAR" \("charset"
"iso-8859-1" "method" "REQUEST" "name" "invite\.ics"\) NIL NIL "7BIT" 2162 44
NIL \("inline" N
IL\) NIL NIL\) "ALTERNATIVE" \("boundary"
"----=_Part_4003_18492227\.1205261626856"\) NIL NIL NIL\)\("APPLICATION" "ICS"
\("name" "invite20080407T190000\.ics"\) NIL NIL "BASE64" 2958 NIL
\("attachment" \("filename" "invite20080407T190000\.ics"\)\) NIL NIL\)\("TEXT"
"HTML" \("charset" "us-ascii" "name" "sonnet\.html"\) NIL NIL "BASE64" 1124 14
NIL \("attachment" \("filename" "sonnet\.html"\)\) NIL NIL\)\("TEXT" "PLAIN"
\("charset" "us-ascii" "name" "sonnet\.txt"\) NIL NIL "BASE64" 816 10 NIL
\("attachment" \("filename" "sonnet\.txt"\)\) NIL NIL\)\("TEXT" "PLAIN"
\("charset" "us-ascii" "name" "another-sonnet\.txt"\) NIL NIL "BASE64" 816 10
NIL \("attachment" \("filename" "another-sonnet\.txt"\)\) NIL NIL\) "MIXED"
\("boundary" "----=_Part_4002_22491526\.1205261626856"\) NIL NIL NIL\)\)
-S: \* 2 FETCH \(BODY \(\(\("TEXT" "PLAIN" \("charset" "iso-8859-1"\) NIL NIL
"7BIT" 775 19\)\("TEXT" "HTML" \("charset" "iso-8859-1"\) NIL NIL "7BIT" 1066
4\)\("TEXT" "CALENDAR" \("charset" "iso-8859-1" "method" "REQUEST" "name"
"invite\.ics"\) NIL NIL "7BIT" 2162 44\) "ALTERNATIVE"\)\("APPLICATION" "ICS"
\("name" "invite20080407T190000\.ics"\) NIL NIL "BASE64" 2958\)\("TEXT" "HTML"
\("charset" "us-ascii" "name" "sonnet\.html"\) NIL NIL "BASE64" 1124
14\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name" "sonnet\.txt"\) NIL NIL
"BASE64" 816 10\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name"
"another-sonnet\.txt"\) NIL NIL "BASE64" 816 10\) "MIXED"\) BODYSTRUCTURE
\(\(\("TEXT" "PLAIN" \("charset" "iso-8859-1"\) NIL NIL "7BIT" 775 19 NIL
\("inline" NIL\) NIL NIL\)\("TEXT" "HTML" \("charset" "iso-8859-1"\) NIL NIL
"7BIT" 1066 4 NIL \("inline" NIL\) NIL NIL\)\("TEXT" "CALENDAR" \("charset"
"iso-8859-1" "method" "REQUEST" "name" "invite\.ics"\) NIL NIL "7BIT" 2162 44
NIL \("inline" N
IL\) NIL NIL\) "ALTERNATIVE" \("boundary"
"----=_Part_4003_18492227\.1205261626856"\) NIL NIL NIL\)\("APPLICATION" "ICS"
\("name" "invite20080407T190000\.ics"\) NIL NIL "BASE64" 2958 NIL
\("attachment" \("filename" "invite20080407T190000\.ics"\)\) NIL NIL\)\("TEXT"
"HTML" \("charset" "us-ascii" "name" "sonnet\.html"\) NIL NIL "BASE64" 1124 14
NIL \("attachment" \("filename" "sonnet\.html"\)\) NIL NIL\)\("TEXT" "PLAIN"
\("charset" "us-ascii" "name" "sonnet\.txt"\) NIL NIL "BASE64" 816 10 NIL
\("attachment" \("filename" "sonnet\.txt"\)\) NIL NIL\)\("TEXT" "PLAIN"
\("charset" "us-ascii" "name" "another-sonnet\.txt"\) NIL NIL "BASE64" 816 10
NIL \("attachment" \("filename" "another-sonnet\.txt"\)\) NIL NIL\) "MIXED"
\("boundary" "----=_Part_4002_22491526\.1205261626856"\) NIL NIL NIL\)\)
-S: \* 3 FETCH \(BODY \(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL
"7BIT" 10 1\)\("TEXT" "HTML" \("charset" "us-ascii"\) NIL NIL "7BIT" 71
1\)\("APPLICATION" "XHTML\+XML" NIL NIL NIL "7BIT" 184\)\("IMAGE" "JPEG" NIL
NIL NIL "BASE64" 29\) "MIXED"\) BODYSTRUCTURE \(\("TEXT" "PLAIN" \("charset"
"us-ascii"\) NIL NIL "7BIT" 10 1 NIL NIL NIL NIL\)\("TEXT" "HTML" \("charset"
"us-ascii"\) NIL NIL "7BIT" 71 1 NIL NIL NIL NIL\)\("APPLICATION" "XHTML\+XML"
NIL NIL NIL "7BIT" 184 NIL NIL NIL NIL\)\("IMAGE" "JPEG" NIL NIL NIL "BASE64"
29 NIL NIL NIL NIL\) "MIXED" \("boundary" "1729"\) NIL NIL NIL\)\)
+S: \* 1 FETCH \(BODY \(\(\("TEXT" "PLAIN" \("charset" "ISO-8859-1"\) NIL NIL
"7BIT" 775 19\)\("TEXT" "HTML" \("charset" "ISO-8859-1"\) NIL NIL "7BIT" 1066
4\)\("TEXT" "CALENDAR" \("charset" "ISO-8859-1" "method" "REQUEST" "name"
"invite\.ics"\) NIL NIL "7BIT" 2162 44\) "ALTERNATIVE"\)\("APPLICATION" "ICS"
\("name" "invite20080407T190000\.ics"\) NIL NIL "BASE64" 2958\)\("TEXT" "HTML"
\("charset" "us-ascii" "name" "sonnet\.html"\) NIL NIL "BASE64" 1124
14\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name" "sonnet\.txt"\) NIL NIL
"BASE64" 816 10\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name"
"another-sonnet\.txt"\) NIL NIL "BASE64" 816 10\) "MIXED"\) BODYSTRUCTURE
\(\(\("TEXT" "PLAIN" \("charset" "ISO-8859-1"\) NIL NIL "7BIT" 775 19 NIL
\("inline" NIL\) NIL NIL\)\("TEXT" "HTML" \("charset" "ISO-8859-1"\) NIL NIL
"7BIT" 1066 4 NIL \("inline" NIL\) NIL NIL\)\("TEXT" "CALENDAR" \("charset"
"ISO-8859-1" "method" "REQUEST" "name" "invite\.ics"\) NIL NIL "7BIT" 2162 44
NIL \("inline" N
IL\) NIL NIL\) "ALTERNATIVE" \("boundary"
"----=_Part_4003_18492227\.1205261626856"\) NIL NIL NIL\)\("APPLICATION" "ICS"
\("name" "invite20080407T190000\.ics"\) NIL NIL "BASE64" 2958 NIL
\("attachment" \("filename" "invite20080407T190000\.ics"\)\) NIL NIL\)\("TEXT"
"HTML" \("charset" "us-ascii" "name" "sonnet\.html"\) NIL NIL "BASE64" 1124 14
NIL \("attachment" \("filename" "sonnet\.html"\)\) NIL NIL\)\("TEXT" "PLAIN"
\("charset" "us-ascii" "name" "sonnet\.txt"\) NIL NIL "BASE64" 816 10 NIL
\("attachment" \("filename" "sonnet\.txt"\)\) NIL NIL\)\("TEXT" "PLAIN"
\("charset" "us-ascii" "name" "another-sonnet\.txt"\) NIL NIL "BASE64" 816 10
NIL \("attachment" \("filename" "another-sonnet\.txt"\)\) NIL NIL\) "MIXED"
\("boundary" "----=_Part_4002_22491526\.1205261626856"\) NIL NIL NIL\)\)
+S: \* 2 FETCH \(BODY \(\(\("TEXT" "PLAIN" \("charset" "ISO-8859-1"\) NIL NIL
"7BIT" 775 19\)\("TEXT" "HTML" \("charset" "ISO-8859-1"\) NIL NIL "7BIT" 1066
4\)\("TEXT" "CALENDAR" \("charset" "ISO-8859-1" "method" "REQUEST" "name"
"invite\.ics"\) NIL NIL "7BIT" 2162 44\) "ALTERNATIVE"\)\("APPLICATION" "ICS"
\("name" "invite20080407T190000\.ics"\) NIL NIL "BASE64" 2958\)\("TEXT" "HTML"
\("charset" "us-ascii" "name" "sonnet\.html"\) NIL NIL "BASE64" 1124
14\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name" "sonnet\.txt"\) NIL NIL
"BASE64" 816 10\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name"
"another-sonnet\.txt"\) NIL NIL "BASE64" 816 10\) "MIXED"\) BODYSTRUCTURE
\(\(\("TEXT" "PLAIN" \("charset" "ISO-8859-1"\) NIL NIL "7BIT" 775 19 NIL
\("inline" NIL\) NIL NIL\)\("TEXT" "HTML" \("charset" "ISO-8859-1"\) NIL NIL
"7BIT" 1066 4 NIL \("inline" NIL\) NIL NIL\)\("TEXT" "CALENDAR" \("charset"
"ISO-8859-1" "method" "REQUEST" "name" "invite\.ics"\) NIL NIL "7BIT" 2162 44
NIL \("inline" N
IL\) NIL NIL\) "ALTERNATIVE" \("boundary"
"----=_Part_4003_18492227\.1205261626856"\) NIL NIL NIL\)\("APPLICATION" "ICS"
\("name" "invite20080407T190000\.ics"\) NIL NIL "BASE64" 2958 NIL
\("attachment" \("filename" "invite20080407T190000\.ics"\)\) NIL NIL\)\("TEXT"
"HTML" \("charset" "us-ascii" "name" "sonnet\.html"\) NIL NIL "BASE64" 1124 14
NIL \("attachment" \("filename" "sonnet\.html"\)\) NIL NIL\)\("TEXT" "PLAIN"
\("charset" "us-ascii" "name" "sonnet\.txt"\) NIL NIL "BASE64" 816 10 NIL
\("attachment" \("filename" "sonnet\.txt"\)\) NIL NIL\)\("TEXT" "PLAIN"
\("charset" "us-ascii" "name" "another-sonnet\.txt"\) NIL NIL "BASE64" 816 10
NIL \("attachment" \("filename" "another-sonnet\.txt"\)\) NIL NIL\) "MIXED"
\("boundary" "----=_Part_4002_22491526\.1205261626856"\) NIL NIL NIL\)\)
+S: \* 3 FETCH \(BODY \(\("TEXT" "PLAIN" \("charset" "US-ASCII"\) NIL NIL
"7BIT" 10 1\)\("TEXT" "HTML" \("charset" "US-ASCII"\) NIL NIL "7BIT" 71
1\)\("APPLICATION" "XHTML\+XML" NIL NIL NIL "7BIT" 184\)\("IMAGE" "JPEG" NIL
NIL NIL "BASE64" 29\) "MIXED"\) BODYSTRUCTURE \(\("TEXT" "PLAIN" \("charset"
"US-ASCII"\) NIL NIL "7BIT" 10 1 NIL NIL NIL NIL\)\("TEXT" "HTML" \("charset"
"US-ASCII"\) NIL NIL "7BIT" 71 1 NIL NIL NIL NIL\)\("APPLICATION" "XHTML\+XML"
NIL NIL NIL "7BIT" 184 NIL NIL NIL NIL\)\("IMAGE" "JPEG" NIL NIL NIL "BASE64"
29 NIL NIL NIL NIL\) "MIXED" \("boundary" "1729"\) NIL NIL NIL\)\)
S: \* 4 FETCH \(BODY \(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL
"7BIT" 625 18\)\("TEXT" "HTML" \("charset" "utf-8"\) NIL NIL "7BIT" 891 29\)
"ALTERNATIVE"\) BODYSTRUCTURE \(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL
NIL "7BIT" 625 18 NIL NIL NIL NIL\)\("TEXT" "HTML" \("charset" "utf-8"\) NIL
NIL "7BIT" 891 29 NIL NIL NIL NIL\) "ALTERNATIVE" \("boundary"
"=-blWYb/063JwXox8nBGv5"\) NIL NIL NIL\)\)
S: \* 5 FETCH \(BODY \(\("TEXT" "PLAIN" \("charset" "us-ascii"\) NIL NIL
"7BIT" 616 14\)\("TEXT" "HTML" \("charset" "us-ascii" "name" "sonnet\.html"\)
NIL NIL "7BIT" 841 19\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name"
"sonnet\.txt"\) NIL NIL "7BIT" 610 14\) "MIXED"\) BODYSTRUCTURE \(\("TEXT"
"PLAIN" \("charset" "us-ascii"\) NIL NIL "7BIT" 616 14 NIL NIL NIL
NIL\)\("TEXT" "HTML" \("charset" "us-ascii" "name" "sonnet\.html"\) NIL NIL
"7BIT" 841 19 NIL \("attachment" \("filename" "sonnet\.html"\)\) NIL
NIL\)\("TEXT" "PLAIN" \("charset" "us-ascii" "name" "sonnet\.txt"\) NIL NIL
"7BIT" 610 14 NIL \("attachment" \("filename" "sonnet\.txt"\)\) NIL NIL\)
"MIXED" \("boundary" "=-iC8rnNDvTPHypqsz\+j7t"\) NIL NIL NIL\)\)
S: \* 6 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"\)\)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]