--- a/browser/components/places/tests/unit/test_bookmarks_html.js
+++ b/browser/components/places/tests/unit/test_bookmarks_html.js
@@ -16,285 +16,386 @@
* The Original Code is mozilla.com code.
*
* The Initial Developer of the Original Code is the Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2007
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Dietrich Ayala <dietrich@mozilla.com>
+ * Marco Bonardo <mak77@bonardo.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
-// get history service
-try {
- var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].getService(Ci.nsINavHistoryService);
-} catch(ex) {
- do_throw("Could not get nav-history-service\n");
-}
-
-// Get bookmark service
-try {
- var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].getService(Ci.nsINavBookmarksService);
-} catch(ex) {
- do_throw("Could not get nav-bookmarks-service\n");
-}
-
-// Get annotation service
-try {
- var annosvc = Cc["@mozilla.org/browser/annotation-service;1"].getService(Ci.nsIAnnotationService);
-} catch(ex) {
- do_throw("Could not get annotation service\n");
-}
-
-// Get livemark service
-try {
- var livemarksvc = Cc["@mozilla.org/browser/livemark-service;2"].getService(Ci.nsILivemarkService);
-} catch(ex) {
- do_throw("Could not get livemark service\n");
-}
-
-// Get favicon service
-try {
- var iconsvc = Cc["@mozilla.org/browser/favicon-service;1"].getService(Ci.nsIFaviconService);
-} catch(ex) {
- do_throw("Could not get favicon service\n");
-}
+// An object representing the contents of bookmarks.preplaces.html.
+let test_bookmarks = {
+ menu: [
+ { title: "Mozilla Firefox",
+ children: [
+ { title: "Help and Tutorials",
+ url: "http://en-us.www.mozilla.com/en-US/firefox/help/",
+ icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
+ },
+ { title: "Customize Firefox",
+ url: "http://en-us.www.mozilla.com/en-US/firefox/customize/",
+ icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
+ },
+ { title: "Get Involved",
+ url: "http://en-us.www.mozilla.com/en-US/firefox/community/",
+ icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
+ },
+ { title: "About Us",
+ url: "http://en-us.www.mozilla.com/en-US/about/",
+ icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
+ },
+ ],
+ },
+ { title: "test",
+ description: "folder test comment",
+ dateAdded: 1177541020000000,
+ lastModified: 1177541050000000,
+ children: [
+ { title: "test post keyword",
+ description: "item description",
+ dateAdded: 1177375336000000,
+ lastModified: 1177375423000000,
+ keyword: "test",
+ sidebar: true,
+ postData: "hidden1%3Dbar&text1%3D%25s",
+ charset: "ISO-8859-1",
+ },
+ ]
+ },
+ ],
+ toolbar: [
+ { title: "Getting Started",
+ url: "http://en-us.www.mozilla.com/en-US/firefox/central/",
+ icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
+ },
+ { title: "Latest Headlines",
+ description: "Livemark test comment",
+ url: "http://en-us.fxfeeds.mozilla.com/en-US/firefox/livebookmarks/",
+ feedUrl: "http://en-us.fxfeeds.mozilla.com/en-US/firefox/headlines.xml",
+ }
+ ],
+ unfiled: [
+ { title: "Example.tld",
+ url: "http://example.tld/",
+ },
+ ],
+};
-// Get io service
-try {
- var iosvc = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-} catch (ex) {
- do_throw("Could not get io service\n");
-}
+// Pre-Places bookmarks.html file pointer.
+let gBookmarksFileOld;
+// Places bookmarks.html file pointer.
+let gBookmarksFileNew;
-const DESCRIPTION_ANNO = "bookmarkProperties/description";
-const LOAD_IN_SIDEBAR_ANNO = "bookmarkProperties/loadInSidebar";
-const POST_DATA_ANNO = "bookmarkProperties/POSTData";
+let importer = Cc["@mozilla.org/browser/places/import-export-service;1"].
+ getService(Ci.nsIPlacesImportExportService);
-const TEST_FAVICON_PAGE_URL = "http://en-US.www.mozilla.com/en-US/firefox/central/";
-const TEST_FAVICON_DATA_URL = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==";
+function run_test()
+{
+ // Avoid creating smart bookmarks during the test.
+ Services.prefs.setIntPref("browser.places.smartBookmarksVersion", -1);
-// main
-function run_test() {
- // get places import/export service
- var importer = Cc["@mozilla.org/browser/places/import-export-service;1"].getService(Ci.nsIPlacesImportExportService);
-
- // avoid creating the places smart folder during tests
- Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch).
- setIntPref("browser.places.smartBookmarksVersion", -1);
+ // File pointer to legacy bookmarks file.
+ gBookmarksFileOld = do_get_file("bookmarks.preplaces.html");
- // file pointer to legacy bookmarks file
- var bookmarksFileOld = do_get_file("bookmarks.preplaces.html");
- // file pointer to a new places-exported bookmarks file
- var bookmarksFileNew = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
- bookmarksFileNew.append("bookmarks.exported.html");
+ // File pointer to a new Places-exported bookmarks file.
+ gBookmarksFileNew = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
+ gBookmarksFileNew.append("bookmarks.exported.html");
+ if (gBookmarksFileNew.exists()) {
+ gBookmarksFileNew.remove(false);
+ }
+ gBookmarksFileNew.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0600);
+ if (!gBookmarksFileNew.exists()) {
+ do_throw("couldn't create file: bookmarks.exported.html");
+ }
- // create bookmarks.exported.html
- if (bookmarksFileNew.exists())
- bookmarksFileNew.remove(false);
- bookmarksFileNew.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, 0600);
- if (!bookmarksFileNew.exists())
- do_throw("couldn't create file: bookmarks.exported.html");
-
+ // This test must be the first one, since it setups the new bookmarks.html.
// Test importing a pre-Places canonical bookmarks file.
// 1. import bookmarks.preplaces.html
// 2. run the test-suite
// Note: we do not empty the db before this import to catch bugs like 380999
try {
- importer.importHTMLFromFile(bookmarksFileOld, true);
+ importer.importHTMLFromFile(gBookmarksFileOld, true);
} catch(ex) { do_throw("couldn't import legacy bookmarks file: " + ex); }
- testCanonicalBookmarks(bmsvc.bookmarksMenuFolder);
+
+ testImportedBookmarks();
+
+ // Prepare for next tests.
+ try {
+ importer.exportHTMLToFile(gBookmarksFileNew);
+ } catch(ex) { do_throw("couldn't export to file: " + ex); }
- // Test exporting a Places canonical bookmarks file.
- // 1. export to bookmarks.exported.html
- // 2. empty bookmarks db
- // 3. import bookmarks.exported.html
- // 4. run the test-suite
+ remove_all_bookmarks();
+ run_next_test();
+}
+
+add_test(function test_import_new()
+{
+ // Test importing a Places bookmarks.html file.
+ // 1. import bookmarks.exported.html
+ // 2. run the test-suite
+
try {
- importer.exportHTMLToFile(bookmarksFileNew);
- } catch(ex) { do_throw("couldn't export to file: " + ex); }
- bmsvc.removeFolderChildren(bmsvc.bookmarksMenuFolder);
- bmsvc.removeFolderChildren(bmsvc.toolbarFolder);
+ importer.importHTMLFromFile(gBookmarksFileNew, true);
+ } catch(ex) { do_throw("couldn't import the exported file: " + ex); }
+
+ testImportedBookmarks();
+
+ remove_all_bookmarks();
+ run_next_test();
+});
+
+add_test(function test_emptytitle_export()
+{
+ // Test exporting and importing with an empty-titled bookmark.
+ // 1. import bookmarks
+ // 1. create an empty-titled bookmark.
+ // 2. export to bookmarks.exported.html
+ // 3. empty bookmarks db
+ // 4. import bookmarks.exported.html
+ // 5. run the test-suite
+
try {
- importer.importHTMLFromFile(bookmarksFileNew, true);
+ importer.importHTMLFromFile(gBookmarksFileNew, true);
} catch(ex) { do_throw("couldn't import the exported file: " + ex); }
- testCanonicalBookmarks(bmsvc.bookmarksMenuFolder);
+
+ const NOTITLE_URL = "http://notitle.mozilla.org/";
+ let id = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+ NetUtil.newURI(NOTITLE_URL),
+ PlacesUtils.bookmarks.DEFAULT_INDEX,
+ "");
+ test_bookmarks.unfiled.push({ title: "", url: NOTITLE_URL });
+
+ try {
+ importer.exportHTMLToFile(gBookmarksFileNew);
+ } catch(ex) { do_throw("couldn't export to file: " + ex); }
+
+ remove_all_bookmarks();
- /*
- // XXX import-to-folder tests disabled due to bug 363634
+ try {
+ importer.importHTMLFromFile(gBookmarksFileNew, true);
+ } catch(ex) { do_throw("couldn't import the exported file: " + ex); }
+
+ testImportedBookmarks();
+
+ // Cleanup.
+ test_bookmarks.unfiled.pop();
+ PlacesUtils.bookmarks.removeItem(id);
+
+ try {
+ importer.exportHTMLToFile(gBookmarksFileNew);
+ } catch(ex) { do_throw("couldn't export to file: " + ex); }
+
+ remove_all_bookmarks();
+ run_next_test();
+});
+
+add_test(function test_import_preplaces_to_folder()
+{
// Test importing a pre-Places canonical bookmarks file to a specific folder.
// 1. create a new folder
// 2. import bookmarks.preplaces.html to that folder
// 3. run the test-suite
- var testFolder = bmsvc.createFolder(bmsvc.bookmarksMenuFolder, "test-import", bmsvc.DEFAULT_INDEX);
+
+ let testFolder = PlacesUtils.bookmarks.createFolder(
+ PlacesUtils.bookmarksMenuFolderId, "test-import",
+ PlacesUtils.bookmarks.DEFAULT_INDEX
+ );
try {
- importer.importHTMLFromFileToFolder(bookmarksFileOld, testFolder, false);
+ importer.importHTMLFromFileToFolder(gBookmarksFileOld, testFolder, false);
} catch(ex) { do_throw("couldn't import the exported file to folder: " + ex); }
- testCanonicalBookmarks(testFolder);
- bmsvc.removeFolder(testFolder);
+
+ // Import-to-folder creates subfolders for toolbar and unfiled.
+ testImportedBookmarksToFolder(testFolder);
+ remove_all_bookmarks();
+ run_next_test();
+});
+
+add_test(function test_import_to_folder()
+{
// Test importing a Places canonical bookmarks file to a specific folder.
// 1. create a new folder
// 2. import bookmarks.exported.html to that folder
// 3. run the test-suite
- var testFolder = bmsvc.createFolder(bmsvc.bookmarksMenuFolder, "test-import", bmsvc.DEFAULT_INDEX);
+
+ let testFolder = PlacesUtils.bookmarks.createFolder(
+ PlacesUtils.bookmarksMenuFolderId, "test-import",
+ PlacesUtils.bookmarks.DEFAULT_INDEX
+ );
try {
- importer.importHTMLFromFileToFolder(bookmarksFileNew, testFolder, false);
+ importer.importHTMLFromFileToFolder(gBookmarksFileNew, testFolder, false);
} catch(ex) { do_throw("couldn't import the exported file to folder: " + ex); }
- testCanonicalBookmarks(testFolder);
- bmsvc.removeFolder(testFolder);
+
+ // Import-to-folder creates subfolders for toolbar and unfiled.
+ testImportedBookmarksToFolder(testFolder);
- // XXX Disabled due to bug 381129 - separators will be duplicated on re-import
+ remove_all_bookmarks();
+ run_next_test();
+});
+
+add_test(function test_import_ontop()
+{
// Test importing the exported bookmarks.html file *on top of* the existing
- // bookmarks. This tests import of IDs. If we support IDs correctly, there
- // should be no difference after the import.
+ // bookmarks.
// 1. empty bookmarks db
// 2. import the exported bookmarks file
// 3. export to file
// 3. import the exported bookmarks file
// 4. run the test-suite
- bmsvc.removeFolderChildren(bmsvc.bookmarksMenuFolder);
+
try {
- importer.importHTMLFromFile(bookmarksFileNew, true);
+ importer.importHTMLFromFile(gBookmarksFileNew, true);
} catch(ex) { do_throw("couldn't import the exported file: " + ex); }
try {
- importer.exportHTMLToFile(bookmarksFileNew);
+ importer.exportHTMLToFile(gBookmarksFileNew);
} catch(ex) { do_throw("couldn't export to file: " + ex); }
try {
- importer.importHTMLFromFile(bookmarksFileNew, true);
+ importer.importHTMLFromFile(gBookmarksFileNew, true);
} catch(ex) { do_throw("couldn't import the exported file: " + ex); }
- testCanonicalBookmarks(bmsvc.bookmarksMenuFolder);
- */
- /*
- XXX if there are new fields we add to the bookmarks HTML format
- then test them here
- Test importing a Places canonical bookmarks file
- 1. empty the bookmarks datastore
- 2. import bookmarks.places.html
- 3. run the test-suite
- 4. run the additional-test-suite
- */
+
+ testImportedBookmarks();
+
+ remove_all_bookmarks();
+ run_next_test();
+});
+
+function testImportedBookmarks()
+{
+ for (let group in test_bookmarks) {
+ let root;
+ switch (group) {
+ case "menu":
+ root = PlacesUtils.getFolderContents(PlacesUtils.bookmarksMenuFolderId).root;
+ break;
+ case "toolbar":
+ root = PlacesUtils.getFolderContents(PlacesUtils.toolbarFolderId).root;
+ break;
+ case "unfiled":
+ root = PlacesUtils.getFolderContents(PlacesUtils.unfiledBookmarksFolderId).root;
+ break;
+ }
+
+ let items = test_bookmarks[group];
+ do_check_eq(root.childCount, items.length);
+
+ items.forEach(function (item, index) checkItem(item, root.getChild(index)));
+
+ root.containerOpen = false;
+ }
+}
+
+function testImportedBookmarksToFolder(aFolder)
+{
+ root = PlacesUtils.getFolderContents(aFolder).root;
+
+ // Menu bookmarks are put directly into the folder, while other roots are
+ // imported into subfolders.
+ let rootFolderCount = test_bookmarks.menu.length;
+
+ for (let i = 0; i < root.childCount; i++) {
+ let child = root.getChild(i);
+ if (i < rootFolderCount) {
+ checkItem(test_bookmarks.menu[i], child);
+ }
+ else {
+ let container = child.QueryInterface(Ci.nsINavHistoryContainerResultNode);
+ let group = /Toolbar/.test(container.title) ? test_bookmarks.toolbar
+ : test_bookmarks.unfiled;
+ container.containerOpen = true;
+ print(container.title);
+ for (let t = 0; t < container.childCount; t++) {
+ print(group[t].title + " " + container.getChild(t).title);
+ checkItem(group[t], container.getChild(t));
+ }
+ container.containerOpen = false;
+ }
+ }
+
+ root.containerOpen = false;
}
-// Tests a bookmarks datastore that has a set of bookmarks, etc
-// that flex each supported field and feature.
-function testCanonicalBookmarks(aFolder) {
- // query to see if the deleted folder and items have been imported
- var query = histsvc.getNewQuery();
- query.setFolders([aFolder], 1);
- var result = histsvc.executeQuery(query, histsvc.getNewQueryOptions());
- var rootNode = result.root;
- rootNode.containerOpen = true;
-
- // 6-2: the toolbar folder and unfiled bookmarks folder imported to the
- // corresponding places folders
- do_check_eq(rootNode.childCount, DEFAULT_BOOKMARKS_ON_MENU + 1);
-
- // get test folder
- var testFolder = rootNode.getChild(DEFAULT_BOOKMARKS_ON_MENU);
- do_check_eq(testFolder.type, testFolder.RESULT_TYPE_FOLDER);
- do_check_eq(testFolder.title, "test");
-
- // add date
- do_check_eq(bmsvc.getItemDateAdded(testFolder.itemId)/1000000, 1177541020);
- // last modified
- do_check_eq(bmsvc.getItemLastModified(testFolder.itemId)/1000000, 1177541050);
-
- testFolder = testFolder.QueryInterface(Ci.nsINavHistoryQueryResultNode);
- do_check_eq(testFolder.hasChildren, true);
- // folder description
- do_check_true(annosvc.itemHasAnnotation(testFolder.itemId,
- DESCRIPTION_ANNO));
- do_check_eq("folder test comment",
- annosvc.getItemAnnotation(testFolder.itemId, DESCRIPTION_ANNO));
- // open test folder, and test the children
- testFolder.containerOpen = true;
- var cc = testFolder.childCount;
- // XXX Bug 380468
- // do_check_eq(cc, 2);
- do_check_eq(cc, 1);
-
- // test bookmark 1
- var testBookmark1 = testFolder.getChild(0);
- // url
- do_check_eq("http://test/post", testBookmark1.uri);
- // title
- do_check_eq("test post keyword", testBookmark1.title);
- // keyword
- do_check_eq("test", bmsvc.getKeywordForBookmark(testBookmark1.itemId));
- // sidebar
- do_check_true(annosvc.itemHasAnnotation(testBookmark1.itemId,
- LOAD_IN_SIDEBAR_ANNO));
- // add date
- do_check_eq(testBookmark1.dateAdded/1000000, 1177375336);
-
- // last modified
- do_check_eq(testBookmark1.lastModified/1000000, 1177375423);
+function checkItem(aExpected, aNode)
+{
+ let id = aNode.itemId;
+ for (prop in aExpected) {
+ switch (prop) {
+ case "title":
+ do_check_eq(aNode.title, aExpected.title);
+ break;
+ case "description":
+ do_check_eq(PlacesUtils.annotations
+ .getItemAnnotation(id, PlacesUIUtils.DESCRIPTION_ANNO),
+ aExpected.description);
+ break;
+ case "dateAdded":
+ do_check_eq(PlacesUtils.bookmarks.getItemDateAdded(id),
+ aExpected.dateAdded);
+ break;
+ case "lastModified":
+ do_check_eq(PlacesUtils.bookmarks.getItemLastModified(id),
+ aExpected.lastModified);
+ break;
+ case "url":
+ if (!PlacesUtils.livemarks.isLivemark(id))
+ do_check_eq(aNode.uri, aExpected.url);
+ break;
+ case "icon":
+ let faviconURI = PlacesUtils.favicons.getFaviconForPage(
+ NetUtil.newURI(aExpected.url)
+ );
+ let dataURL = PlacesUtils.favicons.getFaviconDataAsDataURL(faviconURI);
+ // Avoid do_check_eq for console spam.
+ do_check_true(dataURL == aExpected.icon);
+ break;
+ case "keyword":
+ break;
+ case "sidebar":
+ do_check_eq(PlacesUtils.annotations
+ .itemHasAnnotation(id, PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO),
+ aExpected.sidebar);
+ break;
+ case "postData":
+ do_check_eq(PlacesUtils.annotations
+ .getItemAnnotation(id, PlacesUtils.POST_DATA_ANNO),
+ aExpected.postData);
+ break;
+ case "charset":
+ do_check_eq(PlacesUtils.history.getCharsetForURI(NetUtil.newURI(aNode.uri)),
+ aExpected.charset);
+ break;
+ case "feedUrl":
+ do_check_true(PlacesUtils.livemarks.isLivemark(id));
+ do_check_eq(PlacesUtils.livemarks.getSiteURI(id).spec,
+ aExpected.url);
+ do_check_eq(PlacesUtils.livemarks.getFeedURI(id).spec,
+ aExpected.feedUrl);
+ break;
+ case "children":
+ let folder = aNode.QueryInterface(Ci.nsINavHistoryContainerResultNode);
+ do_check_eq(folder.hasChildren, aExpected.children.length > 0);
+ folder.containerOpen = true;
+ do_check_eq(folder.childCount, aExpected.children.length);
- // post data
- do_check_true(annosvc.itemHasAnnotation(testBookmark1.itemId,
- POST_DATA_ANNO));
- do_check_eq("hidden1%3Dbar&text1%3D%25s",
- annosvc.getItemAnnotation(testBookmark1.itemId, POST_DATA_ANNO));
-
- // last charset
- var testURI = uri(testBookmark1.uri);
- do_check_eq("ISO-8859-1", histsvc.getCharsetForURI(testURI));
-
- // description
- do_check_true(annosvc.itemHasAnnotation(testBookmark1.itemId,
- DESCRIPTION_ANNO));
- do_check_eq("item description",
- annosvc.getItemAnnotation(testBookmark1.itemId,
- DESCRIPTION_ANNO));
-
- // clean up
- testFolder.containerOpen = false;
- rootNode.containerOpen = false;
+ aExpected.children.forEach(function (item, index) checkItem(item, folder.getChild(index)));
- query.setFolders([bmsvc.toolbarFolder], 1);
- result = histsvc.executeQuery(query, histsvc.getNewQueryOptions());
- // bookmarks toolbar
- var toolbar = result.root;
- toolbar.containerOpen = true;
- do_check_eq(toolbar.childCount, 2);
-
- // livemark
- var livemark = toolbar.getChild(1);
- // title
- do_check_eq("Latest Headlines", livemark.title);
- // livemark check
- do_check_true(livemarksvc.isLivemark(livemark.itemId));
- // site url
- do_check_eq("http://en-us.fxfeeds.mozilla.com/en-US/firefox/livebookmarks/",
- livemarksvc.getSiteURI(livemark.itemId).spec);
- // feed url
- do_check_eq("http://en-us.fxfeeds.mozilla.com/en-US/firefox/headlines.xml",
- livemarksvc.getFeedURI(livemark.itemId).spec);
-
- toolbar.containerOpen = false;
-
- // unfiled bookmarks
- query.setFolders([bmsvc.unfiledBookmarksFolder], 1);
- result = histsvc.executeQuery(query, histsvc.getNewQueryOptions());
- var unfiledBookmarks = result.root;
- unfiledBookmarks.containerOpen = true;
- do_check_eq(unfiledBookmarks.childCount, 1);
- unfiledBookmarks.containerOpen = false;
-
- // favicons
- var faviconURI = iconsvc.getFaviconForPage(uri(TEST_FAVICON_PAGE_URL));
- var dataURL = iconsvc.getFaviconDataAsDataURL(faviconURI);
- do_check_eq(TEST_FAVICON_DATA_URL, dataURL);
+ folder.containerOpen = false;
+ break;
+ default:
+ throw new Error("Unknown property");
+ }
+ };
}