summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2014-03-24 13:55:35 -0700
committerMartin Hibdon <mhibdon@google.com>2014-03-27 21:23:32 +0000
commit38f9991634ba5a3119065ee4f7b521946f9c1fec (patch)
tree5c59bcec9c574c1a386227f34c29ca0d46b821cb /tests
parent41e3f37b501ea787c6569f4ac22a11d269dd6557 (diff)
downloadandroid_packages_apps_Email-38f9991634ba5a3119065ee4f7b521946f9c1fec.tar.gz
android_packages_apps_Email-38f9991634ba5a3119065ee4f7b521946f9c1fec.tar.bz2
android_packages_apps_Email-38f9991634ba5a3119065ee4f7b521946f9c1fec.zip
Fix IMAP message upsync to include attachments.
b/13138456 Change-Id: If16b619a650c640a37cb4563750a6327a5e601e6 (cherry picked from commit 0c8696c2ebd52c7f2a92fa7b6b8d5d2005c19d1c)
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/email/mail/store/ImapStoreUnitTests.java6
-rw-r--r--tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java3
-rw-r--r--tests/src/com/android/emailcommon/mail/MockFolder.java4
3 files changed, 6 insertions, 7 deletions
diff --git a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java
index 2c1c6dc99..5e9efe617 100644
--- a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java
+++ b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java
@@ -1185,7 +1185,7 @@ public class ImapStoreUnitTests extends InstrumentationTestCase {
ImapMessage message = prepareForAppendTest(mock, "oK [aPPENDUID 1234567 13] (Success)");
- mFolder.appendMessages(new Message[] {message});
+ mFolder.appendMessage(getInstrumentation().getTargetContext(), message, false);
assertEquals("13", message.getUid());
assertEquals(7, mFolder.getMessageCount());
@@ -1216,7 +1216,7 @@ public class ImapStoreUnitTests extends InstrumentationTestCase {
getNextTag(true) + " oK success"
});
- mFolder.appendMessages(new Message[] {message});
+ mFolder.appendMessage(getInstrumentation().getTargetContext(), message, false);
assertEquals("321", message.getUid());
}
@@ -1250,7 +1250,7 @@ public class ImapStoreUnitTests extends InstrumentationTestCase {
getNextTag(true) + " oK Search completed."
});
- mFolder.appendMessages(new Message[] {message});
+ mFolder.appendMessage(getInstrumentation().getTargetContext(), message, false);
// Shouldn't have changed
assertEquals("initial uid", message.getUid());
diff --git a/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java b/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java
index 58283d442..0af788756 100644
--- a/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java
+++ b/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java
@@ -298,9 +298,6 @@ public class Pop3StoreUnitTests extends AndroidTestCase {
assertEquals(1, flags.length);
assertEquals(Flag.DELETED, flags[0]);
- // appendMessages(Message[] messages) does nothing
- mFolder.appendMessages(null);
-
// delete(boolean recurse) does nothing
// TODO - it should!
mFolder.delete(false);
diff --git a/tests/src/com/android/emailcommon/mail/MockFolder.java b/tests/src/com/android/emailcommon/mail/MockFolder.java
index a35fb3db2..9c5ae7a4c 100644
--- a/tests/src/com/android/emailcommon/mail/MockFolder.java
+++ b/tests/src/com/android/emailcommon/mail/MockFolder.java
@@ -16,13 +16,15 @@
package com.android.emailcommon.mail;
+import android.content.Context;
+
import com.android.emailcommon.service.SearchParams;
public class MockFolder extends Folder {
@Override
- public void appendMessages(Message[] messages) {
+ public void appendMessage(Context context, Message message, boolean noTimeout) {
}
@Override