+ * Typical usage of these helper functions and builder objects are as follows. + *
+ *
+ * String text2 = new TextBuilder("").text("")
+ * .text("").cidImg("contetid@domain").text("").build("").text("")
+ * .text("").uriImg(contentUri).text("").build("
+ */
+
+public class MessageTestUtils {
+
+ /**
+ * Generate AttachmentProvider content URI from attachment ID and Account.
+ *
+ * @param attachmentId attachment id
+ * @param account Account object
+ * @return AttachmentProvider content URI
+ */
+ public static Uri contentUri(long attachmentId, Account account) {
+ return AttachmentProvider.getAttachmentUri(account, attachmentId);
+ }
+
+ /**
+ * Create simple MimeBodyPart.
+ *
+ * @param mimeType MIME type of body part
+ * @param contentId content-id header value (optional - null for no header)
+ * @return MimeBodyPart object which body is null.
+ * @throws MessagingException
+ */
+ public static BodyPart bodyPart(String mimeType, String contentId) throws MessagingException {
+ final MimeBodyPart bp = new MimeBodyPart(null, mimeType);
+ if (contentId != null) {
+ bp.setHeader(MimeHeader.HEADER_CONTENT_ID, contentId);
+ }
+ return bp;
+ }
+
+ /**
+ * Create MimeBodyPart with TextBody.
+ *
+ * @param mimeType MIME type of text
+ * @param text body text string
+ * @return MimeBodyPart object whose body is TextBody
+ * @throws MessagingException
+ */
+ public static BodyPart textPart(String mimeType, String text) throws MessagingException {
+ final TextBody textBody = new TextBody(text);
+ final MimeBodyPart textPart = new MimeBodyPart(textBody);
+ textPart.setHeader(MimeHeader.HEADER_CONTENT_TYPE, mimeType);
+ return textPart;
+ }
+
+ /**
+ * Create attachment BodyPart with content-id.
+ *
+ * @param mimeType MIME type of image body
+ * @param contentId content-id header value (optional - null for no header)
+ * @param attachmentId attachment id of store
+ * @param store LocalStore which stores attachment
+ * @return LocalAttachmentBodyPart with content-id
+ * @throws MessagingException
+ * @throws IOException
+ */
+ public static BodyPart imagePart(String mimeType, String contentId,
+ long attachmentId, LocalStore store) throws MessagingException, IOException {
+ final BinaryTempFileBody imageBody = new BinaryTempFileBody();
+ final LocalStore.LocalAttachmentBodyPart imagePart =
+ store.new LocalAttachmentBodyPart(imageBody, attachmentId);
+ imagePart.setHeader(MimeHeader.HEADER_CONTENT_TYPE, mimeType);
+ if (contentId != null) {
+ imagePart.setHeader(MimeHeader.HEADER_CONTENT_ID, contentId);
+ }
+ return imagePart;
+ }
+
+ /**
+ * Builder class for Multipart.
+ *
+ * This builder object accepts any number of BodyParts and then can produce
+ * Multipart or BodyPart which contains accepted BodyParts. Usually combined with other
+ * builder object and helper method.
+ */
+ public static class MultipartBuilder {
+ private final String mContentType;
+ private final ArrayList mParts = new ArrayList();
+
+ /**
+ * Create builder object with MIME type and dummy boundary string.
+ *
+ * @param mimeType MIME type of this Multipart
+ */
+ public MultipartBuilder(String mimeType) {
+ this(mimeType, "this_is_boundary");
+ }
+
+ /**
+ * Create builder object with MIME type and boundary string.
+ *
+ * @param mimeType MIME type of this Multipart
+ * @param boundary boundary string
+ */
+ public MultipartBuilder(String mimeType, String boundary) {
+ mContentType = mimeType + "; boundary=" + boundary;
+ }
+
+ /**
+ * Modifier method to add BodyPart to intended Multipart.
+ *
+ * @param bodyPart BodyPart to be added
+ * @return builder object itself
+ */
+ public MultipartBuilder addBodyPart(final BodyPart bodyPart) {
+ mParts.add(bodyPart);
+ return this;
+ }
+
+ /**
+ * Build method to create Multipart.
+ *
+ * @return intended Multipart object
+ * @throws MessagingException
+ */
+ public Multipart build() throws MessagingException {
+ final MimeMultipart mp = new MimeMultipart(mContentType);
+ for (BodyPart p : mParts) {
+ mp.addBodyPart(p);
+ }
+ return mp;
+ }
+
+ /**
+ * Build method to create BodyPart that contains this "Multipart"
+ * @return BodyPart whose body is intended Multipart.
+ * @throws MessagingException
+ */
+ public BodyPart buildBodyPart() throws MessagingException {
+ final BodyPart bp = new MimeBodyPart();
+ bp.setBody(this.build());
+ return bp;
+ }
+ }
+
+ /**
+ * Builder class for Message
+ *
+ * This builder object accepts Body and then can produce Message object.
+ * Usually combined with other builder object and helper method.
+ */
+ public static class MessageBuilder {
+ private Body mBody;
+
+ /**
+ * Create Builder object.
+ */
+ public MessageBuilder() {
+ }
+
+ /**
+ * Modifier method to set Body.
+ *
+ * @param body Body of intended Message
+ * @return builder object itself
+ */
+ public MessageBuilder setBody(final Body body) {
+ mBody = body;
+ return this;
+ }
+
+ /**
+ * Build method to create Message.
+ *
+ * @return intended Message object
+ * @throws MessagingException
+ */
+ public Message build() throws MessagingException {
+ final MimeMessage msg = new MimeMessage();
+ if (mBody == null) {
+ throw new MessagingException("body is not specified");
+ }
+ msg.setBody(mBody);
+ return msg;
+ }
+ }
+
+ /**
+ * Builder class for simple HTML String.
+ * This builder object accepts some type of object or and string and then create String object.
+ * Usually combined with other builder object and helper method.
+ */
+ public static class TextBuilder {
+ final StringBuilder mBuilder = new StringBuilder();
+
+ /**
+ * Create builder with preamble string
+ * @param preamble
+ */
+ public TextBuilder(String preamble) {
+ mBuilder.append(preamble);
+ }
+
+ /**
+ * Modifier method to add img tag that has cid: src attribute.
+ * @param contentId content id string
+ * @return builder object itself
+ */
+ public TextBuilder addCidImg(String contentId) {
+ return addTag("img", "SRC", "cid:" + contentId);
+ }
+
+ /**
+ * Modifier method to add img tag that has content:// src attribute.
+ * @param contentUri content uri object
+ * @return builder object itself
+ */
+ public TextBuilder addUidImg(Uri contentUri) {
+ return addTag("img", "src", contentUri.toString());
+ }
+
+ /**
+ * Modifier method to add tag with specified attribute and value.
+ *
+ * @param tag tag name
+ * @param attribute attribute name
+ * @param value attribute value
+ * @return builder object itself
+ */
+ public TextBuilder addTag(String tag, String attribute, String value) {
+ return addText(String.format("<%s %s=\"%s\">", tag, attribute, value));
+ }
+
+ /**
+ * Modifier method to add simple string.
+ * @param text string to add
+ * @return builder object itself
+ */
+ public TextBuilder addText(String text) {
+ mBuilder.append(text);
+ return this;
+ }
+
+ /**
+ * Build method to create intended String
+ * @param epilogue string to add to the end
+ * @return intended String
+ */
+ public String build(String epilogue) {
+ mBuilder.append(epilogue);
+ return mBuilder.toString();
+ }
+ }
+
+}
diff --git a/tests/src/com/android/email/mail/internet/MimeBodyPartTest.java b/tests/src/com/android/email/mail/internet/MimeBodyPartTest.java
new file mode 100644
index 000000000..d0ba8eacb
--- /dev/null
+++ b/tests/src/com/android/email/mail/internet/MimeBodyPartTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.email.mail.internet;
+
+import com.android.email.mail.MessagingException;
+import com.android.email.mail.internet.MimeBodyPart;
+import com.android.email.mail.internet.MimeHeader;
+
+import junit.framework.TestCase;
+
+import android.test.suitebuilder.annotation.SmallTest;
+
+/**
+ * This is a series of unit tests for the MimeBodyPart class. These tests must be locally
+ * complete - no server(s) required.
+ */
+@SmallTest
+public class MimeBodyPartTest extends TestCase {
+
+ // TODO: more tests.
+
+ /*
+ * Confirm getContentID() correctly works.
+ */
+ public void testGetContentId() throws MessagingException {
+ MimeBodyPart bp = new MimeBodyPart();
+
+ // no content-id
+ assertNull(bp.getContentId());
+
+ // normal case
+ final String cid1 = "cid.1@android.com";
+ bp.setHeader(MimeHeader.HEADER_CONTENT_ID, cid1);
+ assertEquals(cid1, bp.getContentId());
+
+ // surrounded by optional bracket
+ bp.setHeader(MimeHeader.HEADER_CONTENT_ID, "<" + cid1 + ">");
+ assertEquals(cid1, bp.getContentId());
+ }
+}
diff --git a/tests/src/com/android/email/mail/internet/MimeMessageTest.java b/tests/src/com/android/email/mail/internet/MimeMessageTest.java
index 4e52532fa..d1fde4a6e 100644
--- a/tests/src/com/android/email/mail/internet/MimeMessageTest.java
+++ b/tests/src/com/android/email/mail/internet/MimeMessageTest.java
@@ -17,6 +17,8 @@
package com.android.email.mail.internet;
import com.android.email.mail.MessagingException;
+import com.android.email.mail.internet.MimeHeader;
+import com.android.email.mail.internet.MimeMessage;
import android.test.suitebuilder.annotation.SmallTest;
@@ -95,4 +97,23 @@ public class MimeMessageTest extends TestCase {
message2.setMessageId(testId2);
assertEquals("set and get Message-ID", testId2, message2.getMessageId());
}
+
+ /*
+ * Confirm getContentID() correctly works.
+ */
+ public void testGetContentId() throws MessagingException {
+ MimeMessage message = new MimeMessage();
+
+ // no content-id
+ assertNull(message.getContentId());
+
+ // normal case
+ final String cid1 = "cid.1@android.com";
+ message.setHeader(MimeHeader.HEADER_CONTENT_ID, cid1);
+ assertEquals(cid1, message.getContentId());
+
+ // surrounded by optional bracket
+ message.setHeader(MimeHeader.HEADER_CONTENT_ID, "<" + cid1 + ">");
+ assertEquals(cid1, message.getContentId());
+ }
}
\ No newline at end of file
diff --git a/tests/src/com/android/email/mail/internet/MimeUtilityTest.java b/tests/src/com/android/email/mail/internet/MimeUtilityTest.java
index bbc1e9359..e894161be 100644
--- a/tests/src/com/android/email/mail/internet/MimeUtilityTest.java
+++ b/tests/src/com/android/email/mail/internet/MimeUtilityTest.java
@@ -16,7 +16,13 @@
package com.android.email.mail.internet;
+import com.android.email.mail.BodyPart;
+import com.android.email.mail.MessageTestUtils;
+import com.android.email.mail.Message;
import com.android.email.mail.MessagingException;
+import com.android.email.mail.Part;
+import com.android.email.mail.MessageTestUtils.MessageBuilder;
+import com.android.email.mail.MessageTestUtils.MultipartBuilder;
import android.test.suitebuilder.annotation.SmallTest;
@@ -35,7 +41,46 @@ public class MimeUtilityTest extends TestCase {
// TODO: tests for foldAndEncode(String s)
// TODO: tests for getHeaderParameter(String header, String name)
// TODO: tests for findFirstPartByMimeType(Part part, String mimeType)
- // TODO: tests for findPartByContentId(Part part, String contentId) throws Exception
+
+ /** Tests for findPartByContentId(Part part, String contentId) */
+ public void testFindPartByContentIdTestCase() throws MessagingException, Exception {
+ final String cid1 = "cid.1@android.com";
+ final Part cid1bp = MessageTestUtils.bodyPart("image/gif", cid1);
+ final String cid2 = "cid.2@android.com";
+ final Part cid2bp = MessageTestUtils.bodyPart("image/gif", "<" + cid2 + ">");
+
+ final Message msg1 = new MessageBuilder()
+ .setBody(new MultipartBuilder("multipart/related")
+ .addBodyPart(MessageTestUtils.bodyPart("text/html", null))
+ .addBodyPart((BodyPart)cid1bp)
+ .build())
+ .build();
+ // found cid1 part
+ final Part actual1_1 = MimeUtility.findPartByContentId(msg1, cid1);
+ assertEquals("could not found expected content-id part", cid1bp, actual1_1);
+
+ final Message msg2 = new MessageBuilder()
+ .setBody(new MultipartBuilder("multipart/mixed")
+ .addBodyPart(MessageTestUtils.bodyPart("image/tiff", "cid.4@android.com"))
+ .addBodyPart(new MultipartBuilder("multipart/related")
+ .addBodyPart(new MultipartBuilder("multipart/alternative")
+ .addBodyPart(MessageTestUtils.bodyPart("text/plain", null))
+ .addBodyPart(MessageTestUtils.bodyPart("text/html", null))
+ .buildBodyPart())
+ .addBodyPart((BodyPart)cid1bp)
+ .buildBodyPart())
+ .addBodyPart(MessageTestUtils.bodyPart("image/gif", "cid.3@android.com"))
+ .addBodyPart((BodyPart)cid2bp)
+ .build())
+ .build();
+ // found cid1 part
+ final Part actual2_1 = MimeUtility.findPartByContentId(msg2, cid1);
+ assertEquals("found part from related multipart", cid1bp, actual2_1);
+
+ // found cid2 part
+ final Part actual2_2 = MimeUtility.findPartByContentId(msg2, cid2);
+ assertEquals("found part from mixed multipart", cid2bp, actual2_2);
+ }
/** Tests for getTextFromPart(Part part) */
public void testGetTextFromPartContentTypeCase() throws MessagingException {
@@ -111,4 +156,5 @@ public class MimeUtilityTest extends TestCase {
// TODO: tests for decodeBody(InputStream in, String contentTransferEncoding)
// TODO: tests for collectParts(Part part, ArrayList viewables, ArrayList attachments)
+
}
diff --git a/tests/src/com/android/email/mail/store/LocalStoreUnitTests.java b/tests/src/com/android/email/mail/store/LocalStoreUnitTests.java
index 57fc0ffeb..cbc32e80b 100644
--- a/tests/src/com/android/email/mail/store/LocalStoreUnitTests.java
+++ b/tests/src/com/android/email/mail/store/LocalStoreUnitTests.java
@@ -18,7 +18,6 @@ package com.android.email.mail.store;
import com.android.email.mail.Address;
import com.android.email.mail.Message;
-import com.android.email.mail.MessageRetrievalListener;
import com.android.email.mail.MessagingException;
import com.android.email.mail.Folder.OpenMode;
import com.android.email.mail.Message.RecipientType;
@@ -26,13 +25,15 @@ import com.android.email.mail.internet.BinaryTempFileBody;
import com.android.email.mail.internet.MimeMessage;
import com.android.email.mail.internet.TextBody;
-import android.app.Application;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
import android.test.AndroidTestCase;
-import android.test.mock.MockApplication;
import android.test.suitebuilder.annotation.SmallTest;
import java.io.File;
import java.net.URI;
+import java.net.URISyntaxException;
/**
* This is a series of unit tests for the LocalStore class.
@@ -53,6 +54,7 @@ public class LocalStoreUnitTests extends AndroidTestCase {
private String mLocalStoreUri = null;
private LocalStore mStore = null;
private LocalStore.LocalFolder mFolder = null;
+ private File mCacheDir;
/**
* Setup code. We generate a lightweight LocalStore and LocalStore.LocalFolder.
@@ -69,7 +71,8 @@ public class LocalStoreUnitTests extends AndroidTestCase {
mFolder = (LocalStore.LocalFolder) mStore.getFolder("TEST");
// This is needed for parsing mime messages
- BinaryTempFileBody.setTempDirectory(this.getContext().getCacheDir());
+ mCacheDir = getContext().getCacheDir();
+ BinaryTempFileBody.setTempDirectory(mCacheDir);
}
/**
@@ -199,6 +202,200 @@ public class LocalStoreUnitTests extends AndroidTestCase {
return message;
}
+ /**
+ * Tests for database version.
+ */
+ public void testDbVersion() throws MessagingException, URISyntaxException {
+ final LocalStore store = new LocalStore(mLocalStoreUri, getContext());
+ final URI uri = new URI(mLocalStoreUri);
+ final String dbPath = uri.getPath();
+ final SQLiteDatabase db = SQLiteDatabase.openOrCreateDatabase(dbPath, null);
+ // database version should be latest.
+ assertEquals("database version should be latest", 20, db.getVersion());
+ db.close();
+ }
+
+ /**
+ * Helper function convert Cursor data to ContentValues
+ */
+ private ContentValues cursorToContentValues(Cursor c, String[] schema) {
+ if (c.getColumnCount() != schema.length) {
+ throw new IndexOutOfBoundsException("schema length is not mach with cursor columns");
+ }
+
+ final ContentValues cv = new ContentValues();
+ for (int i = 0, count = c.getColumnCount(); i < count; ++i) {
+ final String key = c.getColumnName(i);
+ final String type = schema[i];
+ if (type == "text") {
+ cv.put(key, c.getString(i));
+ } else if (type == "integer" || type == "primary") {
+ cv.put(key, c.getLong(i));
+ } else if (type == "numeric" || type == "real") {
+ cv.put(key, c.getDouble(i));
+ } else if (type == "blob") {
+ cv.put(key, c.getBlob(i));
+ } else {
+ throw new IllegalArgumentException("unsupported type at index " + i);
+ }
+ }
+ return cv;
+ }
+
+ /**
+ * Tests for database upgrade from version 18 to version 20.
+ */
+ public void testDbUpgrade18To20() throws MessagingException, URISyntaxException {
+ final URI uri = new URI(mLocalStoreUri);
+ final String dbPath = uri.getPath();
+ SQLiteDatabase db = SQLiteDatabase.openOrCreateDatabase(dbPath, null);
+
+ // create sample version 18 db tables
+ createSampleDb(db, 18);
+
+ // sample message data and expected data
+ final ContentValues initialMessage = new ContentValues();
+ initialMessage.put("folder_id", (long) 2); // folder_id type integer == Long
+ initialMessage.put("internal_date", (long) 3); // internal_date type integer == Long
+ final ContentValues expectedMessage = new ContentValues(initialMessage);
+ expectedMessage.put("id", db.insert("messages", null, initialMessage));
+
+ // sample attachment data and expected data
+ final ContentValues initialAttachment = new ContentValues();
+ initialAttachment.put("message_id", (long) 4); // message_id type integer == Long
+ initialAttachment.put("mime_type", (String) "a"); // mime_type type text == String
+ final ContentValues expectedAttachment = new ContentValues(initialAttachment);
+ expectedAttachment.put("id", db.insert("attachments", null, initialAttachment));
+ db.close();
+
+ // upgrade database 18 to 20
+ new LocalStore(mLocalStoreUri, getContext());
+
+ // added message_id column should be initialized as null
+ expectedMessage.put("message_id", (String) null); // message_id type text == String
+ // added content_id column should be initialized as null
+ expectedAttachment.put("content_id", (String) null); // content_id type text == String
+
+ // database should be upgraded
+ db = SQLiteDatabase.openOrCreateDatabase(dbPath, null);
+ assertEquals("database should be upgraded", 20, db.getVersion());
+ Cursor c;
+
+ // check message table
+ c = db.query("messages",
+ new String[] { "id", "folder_id", "internal_date", "message_id" },
+ null, null, null, null, null);
+ // check if data is available
+ assertTrue("messages table should have one data", c.moveToNext());
+
+ // check if data are expected
+ final ContentValues actualMessage = cursorToContentValues(c,
+ new String[] { "primary", "integer", "integer", "text" });
+ assertEquals("messages table cursor does not have expected values",
+ expectedMessage, actualMessage);
+ c.close();
+
+ // check attachment table
+ c = db.query("attachments",
+ new String[] { "id", "message_id", "mime_type", "content_id" },
+ null, null, null, null, null);
+ // check if data is available
+ assertTrue("attachments table should have one data", c.moveToNext());
+
+ // check if data are expected
+ final ContentValues actualAttachment = cursorToContentValues(c,
+ new String[] { "primary", "integer", "text", "text" });
+ assertEquals("attachment table cursor does not have expected values",
+ expectedAttachment, actualAttachment);
+ c.close();
+
+ db.close();
+ }
+
+ /**
+ * Tests for database upgrade from version 19 to version 20.
+ */
+ public void testDbUpgrade19To20() throws MessagingException, URISyntaxException {
+ final URI uri = new URI(mLocalStoreUri);
+ final String dbPath = uri.getPath();
+ SQLiteDatabase db = SQLiteDatabase.openOrCreateDatabase(dbPath, null);
+
+ // create minimu version 18 db tables
+ createSampleDb(db, 19);
+
+ // sample message data and expected data
+ final ContentValues initialMessage = new ContentValues();
+ initialMessage.put("folder_id", (long) 2); // folder_id type integer == Long
+ initialMessage.put("internal_date", (long) 3); // internal_date integer == Long
+ initialMessage.put("message_id", (String) "x"); // message_id text == String
+ final ContentValues expectedMessage = new ContentValues(initialMessage);
+ expectedMessage.put("id", db.insert("messages", null, initialMessage));
+
+ // sample attachment data and expected data
+ final ContentValues initialAttachment = new ContentValues();
+ initialAttachment.put("message_id", (long) 4); // message_id type integer == Long
+ initialAttachment.put("mime_type", (String) "a"); // mime_type type text == String
+ final ContentValues expectedAttachment = new ContentValues(initialAttachment);
+ expectedAttachment.put("id", db.insert("attachments", null, initialAttachment));
+
+ db.close();
+
+ // upgrade database 19 to 20
+ new LocalStore(mLocalStoreUri, getContext());
+
+ // added content_id column should be initialized as null
+ expectedAttachment.put("content_id", (String) null); // content_id type text == String
+
+ // database should be upgraded
+ db = SQLiteDatabase.openOrCreateDatabase(dbPath, null);
+ assertEquals(20, db.getVersion());
+ Cursor c;
+
+ // check message table
+ c = db.query("messages",
+ new String[] { "id", "folder_id", "internal_date", "message_id" },
+ null, null, null, null, null);
+ // check if data is available
+ assertTrue("attachments table should have one data", c.moveToNext());
+
+ // check if data are expected
+ final ContentValues actualMessage = cursorToContentValues(c,
+ new String[] { "primary", "integer", "integer", "text" });
+ assertEquals("messages table cursor does not have expected values",
+ expectedMessage, actualMessage);
+
+ // check attachment table
+ c = db.query("attachments",
+ new String[] { "id", "message_id", "mime_type", "content_id" },
+ null, null, null, null, null);
+ // check if data is available
+ assertTrue("attachments table should have one data", c.moveToNext());
+
+ // check if data are expected
+ final ContentValues actualAttachment = cursorToContentValues(c,
+ new String[] { "primary", "integer", "text", "text" });
+ assertEquals("attachment table cursor does not have expected values",
+ expectedAttachment, actualAttachment);
+
+ db.close();
+ }
+
+ private static void createSampleDb(SQLiteDatabase db, int version) {
+ db.execSQL("DROP TABLE IF EXISTS messages");
+ db.execSQL("CREATE TABLE messages (id INTEGER PRIMARY KEY, folder_id INTEGER, " +
+ "uid TEXT, subject TEXT, date INTEGER, flags TEXT, sender_list TEXT, " +
+ "to_list TEXT, cc_list TEXT, bcc_list TEXT, reply_to_list TEXT, " +
+ "html_content TEXT, text_content TEXT, attachment_count INTEGER, " +
+ "internal_date INTEGER" +
+ ((version >= 19) ? ", message_id TEXT" : "") +
+ ")");
+ db.execSQL("DROP TABLE IF EXISTS attachments");
+ db.execSQL("CREATE TABLE attachments (id INTEGER PRIMARY KEY, message_id INTEGER," +
+ "store_data TEXT, content_uri TEXT, size INTEGER, name TEXT," +
+ "mime_type TEXT" +
+ ((version >= 20) ? ", content_id" : "") +
+ ")");
+ db.setVersion(version);
+ }
}
-
diff --git a/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java b/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java
index 07ec55aad..862bed5f8 100644
--- a/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java
+++ b/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java
@@ -27,6 +27,7 @@ import com.android.email.mail.Folder.FolderType;
import com.android.email.mail.Folder.OpenMode;
import com.android.email.mail.Message.RecipientType;
import com.android.email.mail.internet.BinaryTempFileBody;
+import com.android.email.mail.internet.MimeMessage;
import com.android.email.mail.transport.MockTransport;
import android.test.AndroidTestCase;
@@ -529,6 +530,16 @@ public class Pop3StoreUnitTests extends AndroidTestCase {
fp.add(FetchProfile.Item.ENVELOPE);
mFolder.fetch(messages, fp, null);
assertEquals(PER_MESSAGE_SIZE, messages[0].getSize());
+
+ // A side effect of how messages work is that if you get fields that are empty,
+ // then empty arrays are written back into the parsed header fields (e.g. mTo, mFrom). The
+ // standard message parser needs to clear these before parsing. Make sure that this
+ // is happening. (This doesn't affect IMAP, which reads the headers directly via
+ // IMAP evelopes.)
+ MimeMessage message = (MimeMessage) messages[0];
+ message.getRecipients(RecipientType.TO);
+ message.getRecipients(RecipientType.CC);
+ message.getRecipients(RecipientType.BCC);
// now try fetching the message
setupSingleMessage(mockTransport, 1, false);
@@ -586,6 +597,20 @@ public class Pop3StoreUnitTests extends AndroidTestCase {
assertEquals(1, from.length);
assertEquals("Jones@Registry.Org", from[0].getAddress());
assertNull(from[0].getPersonal());
+
+ // check Cc:
+ Address[] cc = message.getRecipients(RecipientType.CC);
+ assertNotNull(cc);
+ assertEquals(1, cc.length);
+ assertEquals("Chris@Registry.Org", cc[0].getAddress());
+ assertNull(cc[0].getPersonal());
+
+ // check Reply-To:
+ Address[] replyto = message.getReplyTo();
+ assertNotNull(replyto);
+ assertEquals(1, replyto.length);
+ assertEquals("Roger@Registry.Org", replyto[0].getAddress());
+ assertNull(replyto[0].getPersonal());
// TODO date
@@ -649,6 +674,10 @@ public class Pop3StoreUnitTests extends AndroidTestCase {
* Date: 26 Aug 76 1429 EDT
* From: Jones@Registry.Org
* To: Smith@Registry.Org
+ *
+ * We'll add the following fields to support additional tests:
+ * Cc: Chris@Registry.Org
+ * Reply-To: Roger@Registry.Org
*
* @param transport the mock transport to preload
* @param msgNum the message number to expect and return
@@ -659,6 +688,8 @@ public class Pop3StoreUnitTests extends AndroidTestCase {
transport.expect(null, "Date: 26 Aug 76 1429 EDT");
transport.expect(null, "From: Jones@Registry.Org");
transport.expect(null, "To: Smith@Registry.Org");
+ transport.expect(null, "CC: Chris@Registry.Org");
+ transport.expect(null, "Reply-To: Roger@Registry.Org");
transport.expect(null, "");
transport.expect(null, ".");
}