Bug 1720042 - Add a test for importing accounts in ThunderbirdProfileImporter.js. r=darktrojan

Fix importing account with multiple identities.

Differential Revision: https://phabricator.services.mozilla.com/D137111

mailnews/import/modules/ThunderbirdProfileImporter.jsm

@@ -438,7 +438,12 @@ class ThunderbirdProfileImporter extends BaseProfileImporter {
       let newName = `${newAccountKey}${name.slice(key.length)}`;
       let newValue = value;
       if (name.endsWith(".identities")) {
-        newValue = identityKeyMap.get(value);
+        // An account can have multiple identities.
+        newValue = value
+          .split(",")
+          .map(v => identityKeyMap.get(v))
+          .filter(Boolean)
+          .join(",");
       } else if (name.endsWith(".server")) {
         newValue = incomingServerKeyMap.get(value);
       }
@@ -449,16 +454,13 @@ class ThunderbirdProfileImporter extends BaseProfileImporter {
     let accounts = Services.prefs
       .getCharPref("mail.accountmanager.accounts", "")
       .split(",");
-    if (accounts.length == 1 && accounts[0] == "") {
-      accounts.length = 0;
-    }
     if (sourceAccounts) {
       for (let sourceAccountKey of sourceAccounts.split(",")) {
         accounts.push(accountKeyMap.get(sourceAccountKey));
       }
       Services.prefs.setCharPref(
         "mail.accountmanager.accounts",
-        accounts.join(",")
+        accounts.filter(Boolean).join(",")
       );
     }
 

mailnews/import/test/unit/test_ThunderbirdProfileImporter.js

@@ -0,0 +1,121 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var { ThunderbirdProfileImporter } = ChromeUtils.import(
+  "resource:///modules/ThunderbirdProfileImporter.jsm"
+);
+
+let tmpProfileDir;
+registerCleanupFunction(() => {
+  tmpProfileDir?.remove(true);
+});
+
+/**
+ * Create a temporary dir to use as the source profile dir. Write a prefs.js
+ * into it.
+ * @param {Array<[string, string]>} prefs - An array of tuples, each tuple is
+ *   a pref represented as [prefName, prefValue].
+ */
+async function createTmpProfileWithPrefs(prefs) {
+  tmpProfileDir?.remove(true);
+
+  // Create a temporary dir.
+  tmpProfileDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
+  tmpProfileDir.append("profile-tmp");
+  tmpProfileDir.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o755);
+  info(`Created a temporary profile at ${tmpProfileDir.path}`);
+
+  // Write prefs to prefs.js.
+  let prefsFile = tmpProfileDir.clone();
+  prefsFile.append("prefs.js");
+  let prefsContent = prefs
+    .map(([name, value]) => {
+      let prefValue = typeof value == "string" ? `"${value}"` : value;
+      return `user_pref("${name}", ${prefValue});`;
+    })
+    .join("\n");
+  return IOUtils.writeUTF8(prefsFile.path, prefsContent);
+}
+
+/**
+ * Construct a temporary profile dir with prefs, import into the current
+ * profile, then check the values of prefs related to mail accounts.
+ */
+add_task(async function test_importAccountsIntoEmptyProfile() {
+  equal(
+    Services.prefs.getCharPref("mail.accountmanager.accounts"),
+    "",
+    "Should have no accounts at first"
+  );
+  let charPrefs = [
+    ["mail.smtpserver.smtp1.username", "smtp-user-1"],
+    ["mail.smtpserver.smtp3.username", "smtp-user-2"],
+    ["mail.smtpservers", "smtp1,smtp3"],
+    ["mail.identity.id1.smtpServer", "smtp3"],
+    ["mail.identity.id3.fullName", "id-name-2"],
+    ["mail.identity.id4.stmpServer", "smtp1"],
+    ["mail.server.server2.type", "none"],
+    ["mail.server.server6.type", "imap"],
+    ["mail.server.server7.type", "pop3"],
+    ["mail.account.account2.server", "server2"],
+    ["mail.account.account3.server", "server6"],
+    ["mail.account.account3.identities", "id1,id3"],
+    ["mail.account.account4.server", "server7"],
+    ["mail.accountmanager.accounts", "account3,account4,account2"],
+  ];
+  await createTmpProfileWithPrefs(charPrefs);
+
+  let importer = new ThunderbirdProfileImporter();
+
+  await importer.startImport(tmpProfileDir, importer.SUPPORTED_ITEMS);
+  // Server/identity/account keys should be changed and remapped correctly after
+  // import.
+  let expectedCharPrefs = [
+    ["mail.smtpserver.smtp1.username", "smtp-user-1"],
+    ["mail.smtpserver.smtp2.username", "smtp-user-2"],
+    ["mail.smtpservers", "smtp1,smtp2"],
+    ["mail.identity.id1.smtpServer", "smtp2"],
+    ["mail.identity.id2.fullName", "id-name-2"],
+    ["mail.identity.id3.stmpServer", "smtp1"],
+    ["mail.server.server1.type", "none"],
+    ["mail.server.server2.type", "imap"],
+    ["mail.server.server3.type", "pop3"],
+    ["mail.account.account1.server", "server1"],
+    ["mail.account.account2.server", "server2"],
+    ["mail.account.account2.identities", "id1,id2"],
+    ["mail.account.account3.server", "server3"],
+    ["mail.accountmanager.accounts", "account2,account3,account1"],
+  ];
+  for (let [name, value] of expectedCharPrefs) {
+    equal(
+      Services.prefs.getCharPref(name, ""),
+      value,
+      `${name} should be correct`
+    );
+  }
+
+  // Remove all the prefs to do the next test.
+  Services.prefs.resetPrefs();
+
+  equal(
+    Services.prefs.getCharPref("mail.accountmanager.accounts"),
+    "",
+    "Should have no accounts after resetPrefs"
+  );
+  await importer.startImport(tmpProfileDir, {
+    ...importer.SUPPORTED_ITEMS,
+    accounts: false,
+    mailMessages: false, // If true, Local Folders is created
+  });
+  equal(
+    Services.prefs.getCharPref("mail.accountmanager.accounts"),
+    "",
+    "Should still have no accounts without importing accounts"
+  );
+
+  Services.prefs.resetPrefs();
+});

mailnews/import/test/unit/xpcshell.ini

@@ -17,6 +17,7 @@ run-if = os == 'win'
 [test_outlook_settings.js]
 run-if = os == 'win'
 [test_shiftjis_csv.js]
+[test_ThunderbirdProfileImporter.js]
 [test_utf16_csv.js]
 [test_vcard_import.js]
 tags = vcard