Author: rdonkin
Date: Tue Nov 20 11:59:37 2007
New Revision: 596804
URL: http://svn.apache.org/viewvc?rev=596804&view=rev
Log:
Added FETCH PEEK tests. Fixed bug in NOT HEADERS.
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/FetchPeek.test
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedStateTest.java
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/FetchPeek.test
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/FetchPeek.test?rev=596804&r1=596803&r2=596804&view=diff
==============================================================================
---
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/FetchPeek.test
(original)
+++
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/FetchPeek.test
Tue Nov 20 11:59:37 2007
@@ -27,7 +27,7 @@
# BODY.PEEK[]
C: f1 FETCH 2 (BODY.PEEK[])
-S: \* 2 FETCH \(BODY\[\] \{255\}
+S: \* 2 FETCH \(BODY\[\] \{254\}
S: Date: Mon, 7 Feb 1994 21:52:25 -0800 \(PST\)
S: From: Fred Foobar <[EMAIL PROTECTED]>
S: Subject: Test 02
@@ -61,7 +61,7 @@
S: To: [EMAIL PROTECTED]
S:
S: \)
-S: f1 OK FETCH completed
+S: f1 OK FETCH completed.
# BODY.PEEK[HEADER.FIELDS.NOT]
C: f1 FETCH 2 (BODY.PEEK[HEADER.FIELDS.NOT (From To)])
@@ -80,7 +80,7 @@
# BODY.PEEK[TEXT]
C: f1 FETCH 2 (BODY.PEEK[TEXT])
-S: \* 2 FETCH \(BODY\[TEXT\] \{10\}
+S: \* 2 FETCH \(BODY\[TEXT\] \{9\}
S: Test 02
S: \)
S: f1 OK FETCH completed.
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java?rev=596804&r1=596803&r2=596804&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java
Tue Nov 20 11:59:37 2007
@@ -276,7 +276,7 @@
String[] excludeNames = extractHeaderList(sectionSpecifier,
"HEADER.FIELDS.NOT ".length());
final Iterator headers = result.iterateHeaders();
- List lines = MessageResultUtils.getMatching(excludeNames, headers);
+ List lines = MessageResultUtils.getNotMatching(excludeNames,
headers);
addHeaders(lines, response);
} else if (sectionSpecifier.startsWith("HEADER.FIELDS ")) {
String[] includeNames = extractHeaderList(sectionSpecifier,
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedStateTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedStateTest.java?rev=596804&r1=596803&r2=596804&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedStateTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedStateTest.java
Tue Nov 20 11:59:37 2007
@@ -36,15 +36,10 @@
//super.testFetchMultipleMessages();
}
- public void testFetchPeekUS() throws Exception {
- // STORE FLAGS.SILENT does not work
- //super.testFetchPeek();
- }
-
public void testFetchSingleMessageUS() throws Exception {
// BODY octet count is buggy.
// The total size of the message is used rather than the size of the
part
- //super.testFetchSingleMessage();
+ //super.testFetchSingleMessageUS();
}
public void testUidUS() throws Exception {
@@ -67,11 +62,6 @@
//super.testFetchMultipleMessages();
}
- public void testFetchPeekKOREA() throws Exception {
- // STORE FLAGS.SILENT does not work
- //super.testFetchPeek();
- }
-
public void testFetchSingleMessageKOREA() throws Exception {
// BODY octet count is buggy.
// The total size of the message is KOREAed rather than the size of
the part
@@ -95,11 +85,6 @@
public void testFetchMultipleMessagesITALY() throws Exception {
// TODO Auto-generated method stub
//super.testFetchMultipleMessages();
- }
-
- public void testFetchPeekITALY() throws Exception {
- // STORE FLAGS.SILENT does not work
- //super.testFetchPeek();
}
public void testFetchSingleMessageITALY() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
