Changeset 263

Timestamp:

08/03/08 10:01:16 AM (4 months ago)

Author:

octorian

Message:

 

Location:

trunk/LogicMailTests

Files:

• .classpath (modified) (1 diff)
• src/org/logicprobe/LogicMail/mail/imap/ImapProtocolTest.java (modified) (7 diffs)
• src/org/logicprobe/LogicMail/mail/NetworkMailStoreTest.java (modified) (6 diffs)
• src/org/logicprobe/LogicMail/model/MailboxNodeTest.java (modified) (1 diff)

trunk/LogicMailTests/.classpath

@@ -4 +4 @@
         <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/BlackBerry 4.1"/>
         <classpathentry combineaccessrules="false" kind="src" path="/LogicMail"/>
-        <classpathentry kind="src" path="/LogicMail/.tmp"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

trunk/LogicMailTests/src/org/logicprobe/LogicMail/mail/imap/ImapProtocolTest.java

@@ -351 +351 @@
         try {
             instance.addExecuteExpectation(
-                "FETCH", "1:1 (FLAGS ENVELOPE)",
+                "FETCH", "1:1 (FLAGS UID ENVELOPE)",
                 new String[] {
-                    "* 1 FETCH (FLAGS (\\Answered \\Seen) " +
+                    "* 1 FETCH (FLAGS (\\Answered \\Seen) UID 10 " +
                     "ENVELOPE (\"Mon, 12 Mar 2007 19:38:31 -0700\" \"Re: Calm down! :-)\" " +
                     "((\"jim smith\" NIL \"jsmith\" \"scratch.test\")) " +
@@ -369 +369 @@
             
             assertEquals(1, result[0].index);
+            assertEquals(10, result[0].uid);
             assertNotNull(result[0].flags);
             assertTrue(result[0].flags.answered);
@@ -428 +429 @@
         try {
             instance.addExecuteExpectation(
-                "FETCH", "1:1 (FLAGS ENVELOPE)",
+                "FETCH", "1:1 (FLAGS UID ENVELOPE)",
                 new String[] {
                     "* 1 FETCH (" +
@@ -439 +440 @@
                     "NIL " +
                     "\"<4690A4EF.3070302@mail.scratch.test>\") " +
-                    "FLAGS (\\Seen))"
+                    "FLAGS (\\Seen) UID 10)"
                 });
             ImapProtocol.FetchEnvelopeResponse[] result = instance.executeFetchEnvelope(1, 1);
@@ -447 +448 @@
             
             assertEquals(1, result[0].index);
+            assertEquals(10, result[0].uid);
             assertNotNull(result[0].flags);
             assertTrue(result[0].flags.seen);
@@ -506 +508 @@
         try {
             instance.addExecuteExpectation(
-                    "STORE", "5 +FLAGS (\\Answered)",
-                    new String[] { "* 5 FETCH (FLAGS (\\Seen \\Answered))" });
-            ImapProtocol.MessageFlags result = instance.executeStore(5, true, new String[] { "\\Answered" });
+                    "UID STORE", "15 +FLAGS (\\Answered)",
+                    new String[] { "* 5 FETCH (FLAGS (\\Seen \\Answered) UID 15)" });
+            ImapProtocol.MessageFlags result = instance.executeStore(15, true, new String[] { "\\Answered" });
             assertNotNull(result);
             
@@ -526 +528 @@
         try {
             instance.addExecuteExpectation(
-                    "STORE", "5 -FLAGS (\\Answered)",
-                    new String[] { "* 5 FETCH (FLAGS ())" });
-            ImapProtocol.MessageFlags result = instance.executeStore(5, false, new String[] { "\\Answered" });
+                    "UID STORE", "15 -FLAGS (\\Answered)",
+                    new String[] { "* 5 FETCH (FLAGS () UID 15)" });
+            ImapProtocol.MessageFlags result = instance.executeStore(15, false, new String[] { "\\Answered" });
             assertNotNull(result);
             

trunk/LogicMailTests/src/org/logicprobe/LogicMail/mail/NetworkMailStoreTest.java

@@ -188 +188 @@
     public void testRequestFolderMessages() {
         fakeIncomingMailClient.folderMessages = new FolderMessage[] {
-                new FolderMessage(new MessageEnvelope(), 42),
-                new FolderMessage(new MessageEnvelope(), 43),
+                new FolderMessage(new MessageEnvelope(), 42, 52),
+                new FolderMessage(new MessageEnvelope(), 43, 53),
         };
         FolderTreeItem folder = new FolderTreeItem("INBOX", "INBOX", ".");
@@ -199 +199 @@
         assertNotNull(eventFolderMessagesAvailable.getMessages());
         assertEquals(2, eventFolderMessagesAvailable.getMessages().length);
-        assertEquals(42, eventFolderMessagesAvailable.getMessages()[0].getIndex());
-        assertEquals(43, eventFolderMessagesAvailable.getMessages()[1].getIndex());
+        assertEquals(52, eventFolderMessagesAvailable.getMessages()[0].getUid());
+        assertEquals(53, eventFolderMessagesAvailable.getMessages()[1].getUid());
     }
     
@@ -206 +206 @@
         fakeIncomingMailClient.message = new Message(new MessageEnvelope(), new TextPart("plain", "Hello World"));
         FolderTreeItem folder = new FolderTreeItem("INBOX", "INBOX", ".");
-        FolderMessage folderMessage = new FolderMessage(fakeIncomingMailClient.message.getEnvelope(), 42);
+        FolderMessage folderMessage = new FolderMessage(fakeIncomingMailClient.message.getEnvelope(), 42, 52);
         instance.requestMessage(folder, folderMessage);
         instance.shutdown(true);
@@ -219 +219 @@
         fakeIncomingMailClient.message = new Message(new MessageEnvelope(), new TextPart("plain", "Hello World"));
         FolderTreeItem folder = new FolderTreeItem("INBOX", "INBOX", ".");
-        FolderMessage folderMessage = new FolderMessage(fakeIncomingMailClient.message.getEnvelope(), 42);
+        FolderMessage folderMessage = new FolderMessage(fakeIncomingMailClient.message.getEnvelope(), 42, 52);
         instance.requestMessageDelete(folder, folderMessage);
         instance.shutdown(true);
@@ -232 +232 @@
         fakeIncomingMailClient.message = new Message(new MessageEnvelope(), new TextPart("plain", "Hello World"));
         FolderTreeItem folder = new FolderTreeItem("INBOX", "INBOX", ".");
-        FolderMessage folderMessage = new FolderMessage(fakeIncomingMailClient.message.getEnvelope(), 42);
+        FolderMessage folderMessage = new FolderMessage(fakeIncomingMailClient.message.getEnvelope(), 42, 52);
         instance.requestMessageUndelete(folder, folderMessage);
         instance.shutdown(true);
@@ -247 +247 @@
         fakeIncomingMailClient.folderTree = folder;
         fakeIncomingMailClient.folderMessages = new FolderMessage[] {
-                        new FolderMessage(fakeIncomingMailClient.message.getEnvelope(), 42),
-                        new FolderMessage(new MessageEnvelope(), 43),
+                        new FolderMessage(fakeIncomingMailClient.message.getEnvelope(), 42, 52),
+                        new FolderMessage(new MessageEnvelope(), 43, 53),
         };
 

trunk/LogicMailTests/src/org/logicprobe/LogicMail/model/MailboxNodeTest.java

@@ -29 +29 @@
     
     public void testAddMessage() {
-        MessageNode message1 = new MessageNode(new FolderMessage(new MessageEnvelope(), 1));
-        MessageNode message2 = new MessageNode(new FolderMessage(new MessageEnvelope(), 2));
-        MessageNode message3 = new MessageNode(new FolderMessage(new MessageEnvelope(), 3));
-        MessageNode message4 = new MessageNode(new FolderMessage(new MessageEnvelope(), 4));
+        MessageNode message1 = new MessageNode(new FolderMessage(new MessageEnvelope(), 1, 11));
+        MessageNode message2 = new MessageNode(new FolderMessage(new MessageEnvelope(), 2, 12));
+        MessageNode message3 = new MessageNode(new FolderMessage(new MessageEnvelope(), 3, 13));
+        MessageNode message4 = new MessageNode(new FolderMessage(new MessageEnvelope(), 4, 14));
         
         // Add messages in-order