Bug 732869 - Test for Bug 235432. r=dbienvenu

mailnews/compose/test/unit/test_bug235432.js

@@ -0,0 +1,155 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/**
+ * Test for bug 235432
+ */
+var testmail = do_get_file("data/message1.eml");
+var expectedTemporaryFile;
+
+const kSender = "from@invalid.com";
+const kTo = "to@invalid.com";
+
+var msgSend = Cc["@mozilla.org/messengercompose/send;1"]
+                .createInstance(Ci.nsIMsgSend);
+
+var gCopyListener =
+{
+  callbackFunction: null,
+  copiedMessageHeaderKeys: [],
+  OnStartCopy: function() {},
+  OnProgress: function(aProgress, aProgressMax) {},
+  SetMessageKey: function(aKey) {
+    try {
+      this.copiedMessageHeaderKeys.push(aKey);
+    } catch (ex) {
+      dump(ex);
+    }
+  },
+  GetMessageId: function(aMessageId) {},
+  OnStopCopy: function(aStatus) {
+    if (this.callbackFunction) {
+      do_timeout_function(0, this.callbackFunction,
+                          null,
+                          [ this.copiedMessageHeaderKeys, aStatus ]);
+    }
+  }
+};
+
+/**
+ * copyFileMessageInLocalFolder
+ * A utility wrapper of nsIMsgCopyService.CopyFileMessage to copy a message
+ * into local inbox folder.
+ *
+ * @param aMessageFile     An instance of nsILocalFile to copy.
+ * @param aMessageFlags    Message flags which will be set after message is
+ *                         copied
+ * @param aMessageKeyword  Keywords which will be set for newly copied
+ *                         message
+ * @param aMessageWindow   Window for notification callbacks, can be null
+ * @param aCallback        Callback function which will be invoked after
+ *                         message is copied
+ */
+function copyFileMessageInLocalFolder(aMessageFile,
+                                      aMessageFlags,
+                                      aMessageKeywords,
+                                      aMessageWindow,
+                                      aCallback) {
+  // Set up local folders
+  loadLocalMailAccount();
+
+  gCopyListener.callbackFunction = aCallback;
+  // Copy a message into the local folder
+  Cc["@mozilla.org/messenger/messagecopyservice;1"]
+    .getService(Ci.nsIMsgCopyService)
+    .CopyFileMessage(aMessageFile,
+                     gLocalInboxFolder,
+                     null, false,
+                     aMessageFlags,
+                     aMessageKeywords,
+                     gCopyListener,
+                     aMessageWindow);
+}
+
+// The attatchment file can not be obtained from js test,
+// so we have to generate the file name here.
+function createExpectedTemporaryFile() {
+  function createTemporaryFile() {
+    let file = Cc["@mozilla.org/file/directory_service;1"]
+                 .getService(Ci.nsIProperties)
+                 .get("TmpD", Ci.nsIFile);
+    file.append("nsmail.tmp");
+    file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0600);
+    return file;
+  }
+
+  let dummyFile = createTemporaryFile();
+  do_register_cleanup(function() {
+    dummyFile.remove(false);
+  });
+
+  let expectedFile = createTemporaryFile();
+  expectedFile.remove(false);
+
+  return expectedFile;
+}
+
+function OnStopCopy(aStatus) {
+  msgSend.abort();
+
+  do_check_false(expectedTemporaryFile.exists());
+
+  do_test_finished();
+}
+
+function run_test() {
+  do_test_pending();
+  copyFileMessageInLocalFolder(testmail, 0, "", null, send_message_later);
+}
+
+function send_message_later(aMessageHeaderKeys, aStatus) {
+  let compFields = Cc["@mozilla.org/messengercompose/composefields;1"]
+                     .createInstance(Ci.nsIMsgCompFields);
+  let params = Cc["@mozilla.org/messengercompose/composeparams;1"]
+                 .createInstance(Ci.nsIMsgComposeParams);
+  params.composeFields = compFields;
+  let msgCompose = MailServices.compose.initCompose(params);
+  let rootFolder = gLocalIncomingServer.rootMsgFolder;
+  rootFolder.createLocalSubfolder("Drafts");
+
+  let smtpServer = getBasicSmtpServer();
+  let identity = getSmtpIdentity(kSender, smtpServer);
+
+  compFields.from = identity.email;
+  compFields.to = kTo;
+
+  let msgHdr = gLocalInboxFolder.GetMessageHeader(aMessageHeaderKeys[0]);
+  let messageUri = gLocalInboxFolder.getUriForMsg(msgHdr);
+
+  let attachment = Cc["@mozilla.org/messengercompose/attachment;1"]
+                     .createInstance(Ci.nsIMsgAttachment);
+  attachment.url = messageUri;
+  attachment.contentType = 'message/rfc822';
+  attachment.name = 'Attachment e-mail';
+  compFields.addAttachment(attachment);
+
+  expectedTemporaryFile = createExpectedTemporaryFile();
+  msgSend.createAndSendMessage(null,
+                               identity,
+                               "",
+                               compFields,
+                               false,
+                               false,
+                               Ci.nsIMsgSend.nsMsgQueueForLater,
+                               null,
+                               'text/plain',
+                               'bodyText\n',
+                               9,
+                               null,
+                               null,
+                               null,
+                               null,
+                               copyListener,
+                               null,
+                               "",
+                               Ci.nsIMsgCompType.New);
+  do_check_true(expectedTemporaryFile.exists());
+}

mailnews/compose/test/unit/xpcshell.ini

@@ -5,6 +5,7 @@ tail = tail_compose.js
 [test_attachment.js]
 [test_attachment_intl.js]
 [test_bug155172.js]
+[test_bug235432.js]
 [test_bug474774.js]
 [test_detectAttachmentCharset.js]
 [test_mailtoURL.js]