moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-14 03:32:22 -05:00
Code Issues Releases Wiki Activity

IMAP: new unit tests and fix $Forwarded flag removal

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1122 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-07-02 06:37:18 +00:00
parent 0cd0bba054
commit 795989445e
2 changed files with 139 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/davmail/imap/ImapConnection.java
View File

@ -251,7 +251,7 @@ public class ImapConnection extends AbstractConnection {
String folderName = BASE64MailboxDecoder.decode(tokens.nextToken()); String folderName = BASE64MailboxDecoder.decode(tokens.nextToken());
try { try {
session.deleteFolder(folderName); session.deleteFolder(folderName);
sendClient(commandId + " OK delete completed"); sendClient(commandId + " OK folder deleted");
} catch (HttpException e) { } catch (HttpException e) {
sendClient(commandId + " NO " + e.getMessage()); sendClient(commandId + " NO " + e.getMessage());
} }
@ -770,8 +770,7 @@ public class ImapConnection extends AbstractConnection {
} }
while (iterator.hasNext()) { while (iterator.hasNext()) {
ExchangeSession.Message message = iterator.next(); ExchangeSession.Message message = iterator.next();
if ((conditions.deleted == null || message.deleted == conditions.deleted) if ((conditions.flagged == null || message.flagged == conditions.flagged)
&& (conditions.flagged == null || message.flagged == conditions.flagged)
&& (conditions.answered == null || message.answered == conditions.answered)) { && (conditions.answered == null || message.answered == conditions.answered)) {
uidList.add(message.getImapUid()); uidList.add(message.getImapUid());
} }
@ -985,7 +984,6 @@ public class ImapConnection extends AbstractConnection {
static final class SearchConditions { static final class SearchConditions {
Boolean flagged; Boolean flagged;
Boolean answered; Boolean answered;
Boolean deleted;
String indexRange; String indexRange;
String uidRange; String uidRange;
} }
@ -1145,6 +1143,12 @@ public class ImapConnection extends AbstractConnection {
} else if ("Junk".equals(flag) && message.junk) { } else if ("Junk".equals(flag) && message.junk) {
properties.put("junk", "0"); properties.put("junk", "0");
message.junk = false; message.junk = false;
} else if ("$Forwarded".equals(flag) && message.forwarded) {
properties.put("forwarded", null);
message.forwarded = false;
} else if ("\\Answered".equals(flag) && message.answered) {
properties.put("answered", null);
message.answered = false;
} }
} }
} else if ("+Flags".equalsIgnoreCase(action) || "+FLAGS.SILENT".equalsIgnoreCase(action)) { } else if ("+Flags".equalsIgnoreCase(action) || "+FLAGS.SILENT".equalsIgnoreCase(action)) {

131
src/test/davmail/imap/TestImap.java
View File

@ -22,6 +22,9 @@ import davmail.AbstractDavMailTestCase;
import davmail.DavGateway; import davmail.DavGateway;
import davmail.Settings; import davmail.Settings;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import java.io.*; import java.io.*;
import java.net.Socket; import java.net.Socket;
@ -33,12 +36,23 @@ public class TestImap extends AbstractDavMailTestCase {
static BufferedWriter socketWriter; static BufferedWriter socketWriter;
static BufferedReader socketReader; static BufferedReader socketReader;
static String messageUid = null;
protected void write(String line) throws IOException {
socketWriter.write(line);
socketWriter.flush();
}
protected void writeLine(String line) throws IOException { protected void writeLine(String line) throws IOException {
socketWriter.write(line); socketWriter.write(line);
socketWriter.newLine(); socketWriter.newLine();
socketWriter.flush(); socketWriter.flush();
} }
protected String readLine() throws IOException {
return socketReader.readLine();
}
protected String readFullAnswer(String prefix) throws IOException { protected String readFullAnswer(String prefix) throws IOException {
String line = socketReader.readLine(); String line = socketReader.readLine();
while (!line.startsWith(prefix)) { while (!line.startsWith(prefix)) {
@ -99,6 +113,123 @@ public class TestImap extends AbstractDavMailTestCase {
readFullAnswer("."); readFullAnswer(".");
} }
public void testCreateFolder() throws IOException {
writeLine(". DELETE testfolder");
readFullAnswer(".");
writeLine(". CREATE testfolder");
assertEquals(". OK folder created", readFullAnswer("."));
}
public void testSelectFolder() throws IOException {
writeLine(". SELECT testfolder");
assertEquals(". OK [READ-WRITE] SELECT completed", readFullAnswer("."));
}
public void testCreateMessage() throws IOException, MessagingException {
MimeMessage mimeMessage = new MimeMessage((Session) null);
mimeMessage.addHeader("To", "test@test.local");
mimeMessage.setText("Test message");
mimeMessage.setSubject("Test subject");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
mimeMessage.writeTo(baos);
byte[] content = baos.toByteArray();
writeLine(". APPEND testfolder (\\Draft) {" + content.length + "}");
assertEquals("+ send literal data", readLine());
writeLine(new String(content));
assertEquals(". OK APPEND completed", readFullAnswer("."));
writeLine(". NOOP");
assertEquals(". OK NOOP completed", readFullAnswer("."));
// fetch message uid
writeLine(". UID FETCH 1:* (FLAGS)");
String messageLine = readLine();
int uidIndex = messageLine.indexOf("UID ") + 4;
messageUid = messageLine.substring(uidIndex, messageLine.indexOf(' ', uidIndex));
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
assertNotNull(messageUid);
}
public void testUidStoreDeletedFlag() throws IOException {
// test deleted flag
writeLine(". UID STORE "+messageUid+" +FLAGS (\\Deleted)");
assertEquals(". OK STORE completed",readFullAnswer("."));
writeLine(". UID FETCH "+messageUid+" (FLAGS)");
assertEquals("* 1 FETCH (UID "+messageUid+" FLAGS (\\Seen \\Deleted \\Draft))", readLine());
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
// remove deleted flag
writeLine(". UID STORE "+messageUid+" -FLAGS (\\Deleted)");
assertEquals(". OK STORE completed",readFullAnswer("."));
writeLine(". UID FETCH "+messageUid+" (FLAGS)");
assertEquals("* 1 FETCH (UID "+messageUid+" FLAGS (\\Seen \\Draft))", readLine());
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
}
public void testUidStoreSeenFlag() throws IOException {
// remove seen flag
writeLine(". UID STORE "+messageUid+" FLAGS (\\Draft)");
assertEquals(". OK STORE completed",readFullAnswer("."));
writeLine(". UID FETCH "+messageUid+" (FLAGS)");
assertEquals("* 1 FETCH (UID "+messageUid+" FLAGS (\\Draft))", readLine());
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
}
public void testUidStoreForwardedFlag() throws IOException {
// add forwarded flag
writeLine(". UID STORE "+messageUid+" +FLAGS ($Forwarded)");
assertEquals(". OK STORE completed",readFullAnswer("."));
writeLine(". UID FETCH "+messageUid+" (FLAGS)");
assertEquals("* 1 FETCH (UID "+messageUid+" FLAGS (\\Draft $Forwarded))", readLine());
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
// remove forwarded flag
writeLine(". UID STORE "+messageUid+" -FLAGS ($Forwarded)");
assertEquals(". OK STORE completed",readFullAnswer("."));
writeLine(". UID FETCH "+messageUid+" (FLAGS)");
assertEquals("* 1 FETCH (UID "+messageUid+" FLAGS (\\Draft))", readLine());
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
}
public void testUidStoreAnsweredFlag() throws IOException {
// add answered flag
writeLine(". UID STORE "+messageUid+" +FLAGS (\\Answered)");
assertEquals(". OK STORE completed",readFullAnswer("."));
writeLine(". UID FETCH "+messageUid+" (FLAGS)");
assertEquals("* 1 FETCH (UID "+messageUid+" FLAGS (\\Draft \\Answered))", readLine());
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
// remove answered flag
writeLine(". UID STORE "+messageUid+" -FLAGS (\\Answered)");
assertEquals(". OK STORE completed",readFullAnswer("."));
writeLine(". UID FETCH "+messageUid+" (FLAGS)");
assertEquals("* 1 FETCH (UID "+messageUid+" FLAGS (\\Draft))", readLine());
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
}
public void testUidStoreJunkFlag() throws IOException {
// add Junk flag
writeLine(". UID STORE "+messageUid+" +FLAGS (Junk)");
assertEquals(". OK STORE completed",readFullAnswer("."));
writeLine(". UID FETCH "+messageUid+" (FLAGS)");
assertEquals("* 1 FETCH (UID "+messageUid+" FLAGS (Junk \\Draft))", readLine());
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
// remove Junk flag
writeLine(". UID STORE "+messageUid+" -FLAGS (Junk)");
assertEquals(". OK STORE completed",readFullAnswer("."));
writeLine(". UID FETCH "+messageUid+" (FLAGS)");
assertEquals("* 1 FETCH (UID "+messageUid+" FLAGS (\\Draft))", readLine());
assertEquals(". OK UID FETCH completed",readFullAnswer("."));
}
public void testDeleteFolder() throws IOException {
writeLine(". DELETE testfolder");
assertEquals(". OK folder deleted",readFullAnswer("."));
}
public void testLogout() throws IOException { public void testLogout() throws IOException {
writeLine(". LOGOUT"); writeLine(". LOGOUT");
assertEquals("* BYE Closing connection", socketReader.readLine()); assertEquals("* BYE Closing connection", socketReader.readLine());