From 21fa1e93baf2d4eec562fbc59ad03e4fb8a6b1ca Mon Sep 17 00:00:00 2001 From: "mozilla.mano%sent.com" Date: Wed, 23 May 2007 01:06:32 +0000 Subject: [PATCH] Bug 372508 - rename insertItem to insertBookmark and add a title parameter. r=dietrich. git-svn-id: svn://10.0.0.236/trunk@226834 18797224-902f-48f8-a5cc-f745e15eee43 --- .../migration/src/nsIEProfileMigrator.cpp | 19 +++--- .../migration/src/nsOperaProfileMigrator.cpp | 14 ++--- .../migration/src/nsSafariProfileMigrator.cpp | 6 +- .../components/places/content/controller.js | 9 ++- .../src/nsPlacesImportExportService.cpp | 13 ++-- .../places/public/nsINavBookmarksService.idl | 10 ++-- .../places/src/nsLivemarkService.js | 12 ++-- .../components/places/src/nsNavBookmarks.cpp | 37 +++++++----- .../places/tests/bookmarks/test_bookmarks.js | 59 +++++++++++-------- .../places/tests/chrome/test_371798.xul | 6 +- .../places/tests/unit/test_annotations.js | 4 +- .../places/tests/unit/test_result_sort.js | 10 +--- 12 files changed, 109 insertions(+), 90 deletions(-) diff --git a/mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp b/mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp index 425b23ebf46..70a136cefd1 100644 --- a/mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp +++ b/mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp @@ -1326,9 +1326,9 @@ nsIEProfileMigrator::CopySmartKeywords(nsIRDFResource* aParentFolder) } #ifdef MOZ_PLACES_BOOKMARKS PRInt64 id; - bms->InsertItem(keywordsFolder, uri, - nsINavBookmarksService::DEFAULT_INDEX, &id); - bms->SetItemTitle(id, keyName); + bms->InsertBookmark(keywordsFolder, uri, + nsINavBookmarksService::DEFAULT_INDEX, keyName, + &id); #else nsCAutoString hostCStr; uri->GetHost(hostCStr); @@ -1469,10 +1469,9 @@ nsIEProfileMigrator::ParseFavoritesFolder(nsIFile* aDirectory, rv = NS_NewFileURI(getter_AddRefs(bookmarkURI), localFile); NS_ENSURE_SUCCESS(rv, rv); PRInt64 id; - rv = aBookmarksService->InsertItem(aParentFolder, bookmarkURI, - nsINavBookmarksService::DEFAULT_INDEX, &id); - NS_ENSURE_SUCCESS(rv, rv); - rv = aBookmarksService->SetItemTitle(id, bookmarkName); + rv = aBookmarksService->InsertBookmark(aParentFolder, bookmarkURI, + nsINavBookmarksService::DEFAULT_INDEX, + bookmarkName, &id); NS_ENSURE_SUCCESS(rv, rv); #else nsCAutoString spec; @@ -1574,10 +1573,10 @@ nsIEProfileMigrator::ParseFavoritesFolder(nsIFile* aDirectory, rv = NS_NewURI(getter_AddRefs(resolvedURI), resolvedURL); NS_ENSURE_SUCCESS(rv, rv); PRInt64 id; - rv = aBookmarksService->InsertItem(aParentFolder, resolvedURI, - nsINavBookmarksService::DEFAULT_INDEX, &id); + rv = aBookmarksService->InsertBookmark(aParentFolder, resolvedURI, + nsINavBookmarksService::DEFAULT_INDEX, + name, &id); if (NS_FAILED(rv)) continue; - rv = aBookmarksService->SetItemTitle(id, name); #else nsCOMPtr bookmark; // As far as I can tell reading the MSDN API document, diff --git a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp index ab9da44bfac..96a75f032af 100644 --- a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp +++ b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp @@ -1230,9 +1230,9 @@ nsOperaProfileMigrator::CopySmartKeywords(nsIBookmarksService* aBMS, #ifdef MOZ_PLACES_BOOKMARKS PRInt64 newId; - rv = aBMS->InsertItem(keywordsFolder, uri, nsINavBookmarksService::DEFAULT_INDEX, &newId); - NS_ENSURE_SUCCESS(rv, rv); - rv = aBMS->SetItemTitle(newId, nameStr); + rv = aBMS->InsertBookmark(keywordsFolder, uri, + nsINavBookmarksService::DEFAULT_INDEX, + nameStr, &newId); NS_ENSURE_SUCCESS(rv, rv); // TODO -- set bookmark keyword to keyword and description to keywordDesc. #else @@ -1410,11 +1410,9 @@ nsOperaProfileMigrator::ParseBookmarksFolder(nsILineInputStream* aStream, if (NS_FAILED(rv)) continue; PRInt64 id; - rv = aBMS->InsertItem(onToolbar ? aToolbar : aParent, - uri, nsINavBookmarksService::DEFAULT_INDEX, &id); - if (NS_FAILED(rv)) - continue; - rv = aBMS->SetItemTitle(id, name); + rv = aBMS->InsertBookmark(onToolbar ? aToolbar : aParent, + uri, nsINavBookmarksService::DEFAULT_INDEX, + name, &id); if (NS_FAILED(rv)) continue; #else diff --git a/mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp b/mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp index 269ed5ada37..58dfd9e7f6a 100644 --- a/mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp +++ b/mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp @@ -1087,9 +1087,9 @@ nsSafariProfileMigrator::ParseBookmarksFolder(CFArrayRef aChildren, nsCOMPtr uri; PRInt64 id; rv |= NS_NewURI(getter_AddRefs(uri), url); - rv |= aBookmarksService->InsertItem(aParentFolder, uri, - nsINavBookmarksService::DEFAULT_INDEX, &id); - rv |= aBookmarksService->SetItemTitle(id, title); + rv |= aBookmarksService->InsertBookmark(aParentFolder, uri, + nsINavBookmarksService::DEFAULT_INDEX, + title, &id); #else nsCOMPtr bookmark; rv |= aBookmarksService->CreateBookmarkInContainer(title.get(), diff --git a/mozilla/browser/components/places/content/controller.js b/mozilla/browser/components/places/content/controller.js index 32e48b1ee9d..6fdd3ba2006 100755 --- a/mozilla/browser/components/places/content/controller.js +++ b/mozilla/browser/components/places/content/controller.js @@ -1660,9 +1660,8 @@ PlacesCreateItemTransaction.prototype = { doTransaction: function PCIT_doTransaction() { var bookmarks = this.utils.bookmarks; - this._id = bookmarks.insertItem(this.container, this._uri, this._index); - if (this._title) - bookmarks.setItemTitle(this._id, this._title); + this._id = bookmarks.insertBookmark(this.container, this._uri, this._index, + this._title); if (this._keyword) bookmarks.setKeywordForBookmark(this._id, this._keyword); if (this._annotations && this._annotations.length > 0) @@ -1880,8 +1879,8 @@ PlacesRemoveItemTransaction.prototype = { undoTransaction: function PRIT_undoTransaction() { this.LOG("UNRemove Item: " + this._uri.spec + " from: " + this._oldContainer + "," + this._oldIndex); - this._id = this.bookmarks.insertItem(this._oldContainer, this._uri, this._oldIndex); - this.bookmarks.setItemTitle(this._id, this._title); + this._id = this.bookmarks.insertBookmark(this._oldContainer, this._uri, + this._oldIndex, this._title); this.utils.setAnnotationsForItem(this._id, this._annotations); } }; diff --git a/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp b/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp index 486c07d98ae..2b0d7a56db7 100644 --- a/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp +++ b/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp @@ -224,7 +224,7 @@ public: PRInt64 mPreviousId; // Contains the date-added and last-modified-date of an imported item. - // Used to override the values set by insertItem, createFolder, etc. + // Used to override the values set by insertBookmark, createFolder, etc. PRTime mPreviousDateAdded; PRTime mPreviousLastModifiedDate; }; @@ -896,12 +896,15 @@ BookmarkContentSink::HandleLinkBegin(const nsIParserNode& node) // if no previous id (or a legacy id), create a new bookmark if (frame.mPreviousId == 0) { // create the bookmark - rv = mBookmarksService->InsertItem(frame.mContainerID, frame.mPreviousLink, - mBookmarksService->DEFAULT_INDEX, &frame.mPreviousId); - NS_ASSERTION(NS_SUCCEEDED(rv), "InsertItem failed"); + rv = mBookmarksService->InsertBookmark(frame.mContainerID, + frame.mPreviousLink, + mBookmarksService->DEFAULT_INDEX, + EmptyString(), + &frame.mPreviousId); + NS_ASSERTION(NS_SUCCEEDED(rv), "InsertBookmark failed"); // set the date added value, if we have it - // important: this has to happen after InsertItem + // important: this has to happen after InsertBookmark // so that we set the imported value if (!dateAdded.IsEmpty()) { PRTime convertedDateAdded = ConvertImportedDateToInternalDate(NS_ConvertUTF16toUTF8(dateAdded)); diff --git a/mozilla/toolkit/components/places/public/nsINavBookmarksService.idl b/mozilla/toolkit/components/places/public/nsINavBookmarksService.idl index f987c8a1a8b..02758e9f020 100644 --- a/mozilla/toolkit/components/places/public/nsINavBookmarksService.idl +++ b/mozilla/toolkit/components/places/public/nsINavBookmarksService.idl @@ -160,7 +160,7 @@ interface nsINavBookmarkObserver : nsISupports * folders. A URI in history can be contained in one or more such folders. */ -[scriptable, uuid(5e44a4e2-5db6-412a-b153-c732c9c62fd5)] +[scriptable, uuid(c3307160-525d-4d3c-9d75-b4f13a9ca05d)] interface nsINavBookmarksService : nsISupports { /** @@ -198,7 +198,7 @@ interface nsINavBookmarksService : nsISupports const unsigned short TYPE_SEPARATOR = 3; /** - * Inserts a child item into the given folder. If this item already exists in + * Inserts a child bookmark into the given folder. If this item already exists in * the given folder, it will be moved to the new position. * @param aParentFolder * The id of the parent folder @@ -206,10 +206,12 @@ interface nsINavBookmarksService : nsISupports * The URI to insert * @param aIndex * The index to insert at, or -1 to append + * @param aTitle + * The title for the new bookmark * @returns The ID of the newly-created bookmark */ - long long insertItem(in long long aParentFolder, in nsIURI aURI, - in long aIndex); + long long insertBookmark(in long long aParentFolder, in nsIURI aURI, + in long aIndex, in AString aTitle); /** * Removes a child item. Used to delete a bookmark or separator. diff --git a/mozilla/toolkit/components/places/src/nsLivemarkService.js b/mozilla/toolkit/components/places/src/nsLivemarkService.js index 9da92ae5390..89afc1e17a7 100644 --- a/mozilla/toolkit/components/places/src/nsLivemarkService.js +++ b/mozilla/toolkit/components/places/src/nsLivemarkService.js @@ -181,8 +181,8 @@ LivemarkService.prototype = { insertLivemarkLoadingItem: function LS_insertLivemarkLoading(bms, folderId) { var loadingURI = gIoService.newURI("about:livemark-loading", null, null); - var id = bms.insertItem(folderId, loadingURI, bms.DEFAULT_INDEX); - bms.setItemTitle(id, this._loading); + var id = bms.insertBookmark(folderId, loadingURI, bms.DEFAULT_INDEX, + this._loading); }, _updateLivemarkChildren: @@ -490,14 +490,14 @@ LivemarkLoadListener.prototype = { insertLivemarkFailedItem: function LS_insertLivemarkFailed(folderId) { var failedURI = gIoService.newURI("about:livemark-failed", null, null); - var id = this._bms.insertItem(folderId, failedURI, this._bms.DEFAULT_INDEX); - this._bms.setItemTitle(id, this._failed); + var id = this._bms.insertBookmark(folderId, failedURI, this._bms.DEFAULT_INDEX, + this._failed); }, insertLivemarkChild: function LS_insertLivemarkChild(folderId, uri, title) { - var id = this._bms.insertItem(folderId, uri, this._bms.DEFAULT_INDEX); - this._bms.setItemTitle(id, title); + var id = this._bms.insertBookmark(folderId, uri, this._bms.DEFAULT_INDEX, + title); this._ans.setItemAnnotationString(id, LMANNO_BMANNO, uri.spec, 0, this._ans.EXPIRE_NEVER); }, diff --git a/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp b/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp index d020b222eaa..1e8380d8fae 100644 --- a/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp +++ b/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp @@ -854,7 +854,9 @@ nsNavBookmarks::GetTagRoot(PRInt64 *aRoot) } NS_IMETHODIMP -nsNavBookmarks::InsertItem(PRInt64 aFolder, nsIURI *aItem, PRInt32 aIndex, PRInt64 *aNewBookmarkId) +nsNavBookmarks::InsertBookmark(PRInt64 aFolder, nsIURI *aItem, PRInt32 aIndex, + const nsAString& aTitle, + PRInt64 *aNewBookmarkId) { // You can pass -1 to indicate append, but no other negative number is allowed if (aIndex < nsINavBookmarksService::DEFAULT_INDEX) @@ -873,20 +875,27 @@ nsNavBookmarks::InsertItem(PRInt64 aFolder, nsIURI *aItem, PRInt32 aIndex, PRInt rv = AdjustIndices(aFolder, index, PR_INT32_MAX, 1); NS_ENSURE_SUCCESS(rv, rv); - nsCAutoString buffer; - buffer.AssignLiteral("INSERT INTO moz_bookmarks (fk, type, parent, position, dateAdded) VALUES ("); - buffer.AppendInt(childID); - buffer.AppendLiteral(", "); - buffer.AppendInt(TYPE_BOOKMARK); - buffer.AppendLiteral(", "); - buffer.AppendInt(aFolder); - buffer.AppendLiteral(", "); - buffer.AppendInt(index); - buffer.AppendLiteral(", "); - buffer.AppendInt(PR_Now()); - buffer.AppendLiteral(")"); + nsCOMPtr statement; + rv = dbConn->CreateStatement(NS_LITERAL_CSTRING("INSERT INTO moz_bookmarks " + "(fk, type, parent, position, title, dateAdded) " + "VALUES (?1, ?2, ?3, ?4, ?5, ?6)"), + getter_AddRefs(statement)); + NS_ENSURE_SUCCESS(rv, rv); - rv = dbConn->ExecuteSimpleSQL(buffer); + rv = statement->BindInt64Parameter(0, childID); + NS_ENSURE_SUCCESS(rv, rv); + rv = statement->BindInt32Parameter(1, TYPE_BOOKMARK); + NS_ENSURE_SUCCESS(rv, rv); + rv = statement->BindInt64Parameter(2, aFolder); + NS_ENSURE_SUCCESS(rv, rv); + rv = statement->BindInt32Parameter(3, index); + NS_ENSURE_SUCCESS(rv, rv); + rv = statement->BindStringParameter(4, aTitle); + NS_ENSURE_SUCCESS(rv, rv); + rv = statement->BindInt64Parameter(5, PR_Now()); + NS_ENSURE_SUCCESS(rv, rv); + + rv = statement->Execute(); NS_ENSURE_SUCCESS(rv, rv); // get row id of the new bookmark diff --git a/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks.js b/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks.js index 83ccedd1241..071db08496c 100644 --- a/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks.js +++ b/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks.js @@ -136,7 +136,8 @@ function run_test() { var beforeInsert = Date.now() * 1000; do_check_true(beforeInsert > 0); - var newId = bmsvc.insertItem(testRoot, uri("http://google.com/"), bmsvc.DEFAULT_INDEX); + var newId = bmsvc.insertBookmark(testRoot, uri("http://google.com/"), + bmsvc.DEFAULT_INDEX, ""); do_check_eq(observer._itemAddedId, newId); do_check_eq(observer._itemAddedParent, testRoot); do_check_eq(observer._itemAddedIndex, testStartIndex); @@ -208,7 +209,8 @@ function run_test() { do_check_eq(bmsvc.getItemTitle(workFolder), "Work #"); // add item into subfolder, specifying index - var newId2 = bmsvc.insertItem(workFolder, uri("http://developer.mozilla.org/"), 0); + var newId2 = bmsvc.insertBookmark(workFolder, uri("http://developer.mozilla.org/"), + 0, ""); do_check_eq(observer._itemAddedId, newId2); do_check_eq(observer._itemAddedParent, workFolder); do_check_eq(observer._itemAddedIndex, 0); @@ -218,7 +220,8 @@ function run_test() { do_check_eq(observer._itemChangedProperty, "title"); // insert item into subfolder - var newId3 = bmsvc.insertItem(workFolder, uri("http://msdn.microsoft.com/"), bmsvc.DEFAULT_INDEX); + var newId3 = bmsvc.insertBookmark(workFolder, uri("http://msdn.microsoft.com/"), + bmsvc.DEFAULT_INDEX, ""); do_check_eq(observer._itemAddedId, newId3); do_check_eq(observer._itemAddedParent, workFolder); do_check_eq(observer._itemAddedIndex, 1); @@ -234,7 +237,8 @@ function run_test() { do_check_eq(observer._itemRemovedIndex, 0); // insert item into subfolder - var newId4 = bmsvc.insertItem(workFolder, uri("http://developer.mozilla.org/"), bmsvc.DEFAULT_INDEX); + var newId4 = bmsvc.insertBookmark(workFolder, uri("http://developer.mozilla.org/"), + bmsvc.DEFAULT_INDEX, ""); do_check_eq(observer._itemAddedId, newId4); do_check_eq(observer._itemAddedParent, workFolder); do_check_eq(observer._itemAddedIndex, 1); @@ -246,7 +250,8 @@ function run_test() { do_check_eq(observer._itemAddedIndex, 2); // insert item - var newId5 = bmsvc.insertItem(homeFolder, uri("http://espn.com/"), bmsvc.DEFAULT_INDEX); + var newId5 = bmsvc.insertBookmark(homeFolder, uri("http://espn.com/"), + bmsvc.DEFAULT_INDEX, ""); do_check_eq(observer._itemAddedId, newId5); do_check_eq(observer._itemAddedParent, homeFolder); do_check_eq(observer._itemAddedIndex, 0); @@ -257,7 +262,8 @@ function run_test() { do_check_eq(observer._itemChangedProperty, "title"); // insert query item - var newId6 = bmsvc.insertItem(testRoot, uri("place:domain=google.com&group=1"), bmsvc.DEFAULT_INDEX); + var newId6 = bmsvc.insertBookmark(testRoot, uri("place:domain=google.com&group=1"), + bmsvc.DEFAULT_INDEX, ""); do_check_eq(observer._itemAddedParent, testRoot); do_check_eq(observer._itemAddedIndex, 3); @@ -325,7 +331,7 @@ function run_test() { bmsvc.removeChildAt(testRoot, 1); // removeChildAt w/ bookmark - bmsvc.insertItem(root, uri("http://blah.com"), 1); + bmsvc.insertBookmark(root, uri("http://blah.com"), 1, ""); bmsvc.removeChildAt(root, 1); // test get folder's index @@ -333,7 +339,8 @@ function run_test() { do_check_eq(bmsvc.getItemIndex(tmpFolder), 2); // test setKeywordForBookmark - var kwTestItemId = bmsvc.insertItem(testRoot, uri("http://keywordtest.com"), bmsvc.DEFAULT_INDEX); + var kwTestItemId = bmsvc.insertBookmark(testRoot, uri("http://keywordtest.com"), + bmsvc.DEFAULT_INDEX, ""); try { var dateAdded = bmsvc.getItemDateAdded(kwTestItemId); // after just inserting, modified should not be set @@ -367,14 +374,16 @@ function run_test() { do_check_eq("http://keywordtest.com/", u.spec); // test getBookmarkIdsForURI - var newId8 = bmsvc.insertItem(testRoot, uri("http://foo8.com/"), bmsvc.DEFAULT_INDEX); + var newId8 = bmsvc.insertBookmark(testRoot, uri("http://foo8.com/"), + bmsvc.DEFAULT_INDEX, ""); var b = bmsvc.getBookmarkIdsForURI(uri("http://foo8.com/"), {}); do_check_eq(b[0], newId8); // test removeFolderChildren // 1) add/remove each child type (bookmark, separator, folder) var tmpFolder = bmsvc.createFolder(testRoot, "removeFolderChildren", bmsvc.DEFAULT_INDEX); - bmsvc.insertItem(tmpFolder, uri("http://foo9.com/"), bmsvc.DEFAULT_INDEX); + bmsvc.insertBookmark(tmpFolder, uri("http://foo9.com/"), bmsvc.DEFAULT_INDEX, + ""); bmsvc.createFolder(tmpFolder, "subfolder", bmsvc.DEFAULT_INDEX); bmsvc.insertSeparator(tmpFolder, bmsvc.DEFAULT_INDEX); // 2) confirm that folder has 3 children @@ -434,10 +443,8 @@ function run_test() { var testFolder = bmsvc.createFolder(testRoot, "test Folder", bmsvc.DEFAULT_INDEX); // add 2 bookmarks - bmsvc.setItemTitle(bmsvc.insertItem(testFolder, mURI, bmsvc.DEFAULT_INDEX), - "title 1"); - bmsvc.setItemTitle(bmsvc.insertItem(testFolder, mURI, bmsvc.DEFAULT_INDEX), - "title 2"); + bmsvc.insertBookmark(testFolder, mURI, bmsvc.DEFAULT_INDEX, "title 1"); + bmsvc.insertBookmark(testFolder, mURI, bmsvc.DEFAULT_INDEX, "title 2"); // query var options = histsvc.getNewQueryOptions(); @@ -458,7 +465,8 @@ function run_test() { } // test change bookmark uri - var newId10 = bmsvc.insertItem(testRoot, uri("http://foo10.com/"), bmsvc.DEFAULT_INDEX); + var newId10 = bmsvc.insertBookmark(testRoot, uri("http://foo10.com/"), + bmsvc.DEFAULT_INDEX, ""); var dateAdded = bmsvc.getItemDateAdded(newId10); // after just inserting, modified should not be set var lastModified = bmsvc.getItemLastModified(newId10); @@ -480,7 +488,8 @@ function run_test() { do_check_eq(observer._itemChangedValue, "http://foo11.com/"); // test getBookmarkURI - var newId11 = bmsvc.insertItem(testRoot, uri("http://foo11.com/"), bmsvc.DEFAULT_INDEX); + var newId11 = bmsvc.insertBookmark(testRoot, uri("http://foo11.com/"), + bmsvc.DEFAULT_INDEX, ""); var bmURI = bmsvc.getBookmarkURI(newId11); do_check_eq("http://foo11.com/", bmURI.spec); @@ -491,7 +500,7 @@ function run_test() { } catch(ex) {} // test getItemIndex - var newId12 = bmsvc.insertItem(testRoot, uri("http://foo11.com/"), 1); + var newId12 = bmsvc.insertBookmark(testRoot, uri("http://foo11.com/"), 1, ""); var bmIndex = bmsvc.getItemIndex(newId12); do_check_eq(1, bmIndex); @@ -508,7 +517,8 @@ function run_test() { // this test confirms that we can find bookmarks that we haven't visited // (which are "hidden") and that we can find by title. // see bug #369887 for more details - var newId13 = bmsvc.insertItem(testRoot, uri("http://foobarcheese.com/"), bmsvc.DEFAULT_INDEX); + var newId13 = bmsvc.insertBookmark(testRoot, uri("http://foobarcheese.com/"), + bmsvc.DEFAULT_INDEX, ""); do_check_eq(observer._itemAddedId, newId13); do_check_eq(observer._itemAddedParent, testRoot); do_check_eq(observer._itemAddedIndex, 13); @@ -607,7 +617,8 @@ function run_test() { } // check setItemLastModified() and setItemDateAdded() - var newId14 = bmsvc.insertItem(testRoot, uri("http://bar.tld/"), bmsvc.DEFAULT_INDEX); + var newId14 = bmsvc.insertBookmark(testRoot, uri("http://bar.tld/"), + bmsvc.DEFAULT_INDEX, ""); var dateAdded = bmsvc.getItemDateAdded(newId14); var lastModified = bmsvc.getItemLastModified(newId14); do_check_eq(lastModified, 0); @@ -626,7 +637,7 @@ function run_test() { // bug 378820 var uri1 = uri("http://foo.tld/a"); - bmsvc.insertItem(testRoot, uri1, bmsvc.DEFAULT_INDEX); + bmsvc.insertBookmark(testRoot, uri1, bmsvc.DEFAULT_INDEX, ""); histsvc.addVisit(uri1, Date.now(), 0, histsvc.TRANSITION_TYPED, false, 0); testSimpleFolderResult(); @@ -657,11 +668,13 @@ function testSimpleFolderResult() { // dateAdded can equal beforeInsert do_check_true(dateAdded >= beforeInsert); - var item = bmsvc.insertItem(parent, uri("about:blank"), bmsvc.DEFAULT_INDEX); + // re-set item title separately so can test nodes' last modified + var item = bmsvc.insertBookmark(parent, uri("about:blank"), + bmsvc.DEFAULT_INDEX, ""); bmsvc.setItemTitle(item, "test bookmark"); - var folder = bmsvc.createFolder(parent, "test folder", bmsvc.DEFAULT_INDEX); - // re-set the folder title so we can test nodes' lastModified + // see above + var folder = bmsvc.createFolder(parent, "test folder", bmsvc.DEFAULT_INDEX); bmsvc.setItemTitle(folder, "test folder"); var options = histsvc.getNewQueryOptions(); diff --git a/mozilla/toolkit/components/places/tests/chrome/test_371798.xul b/mozilla/toolkit/components/places/tests/chrome/test_371798.xul index 74b820fe946..749d612f943 100644 --- a/mozilla/toolkit/components/places/tests/chrome/test_371798.xul +++ b/mozilla/toolkit/components/places/tests/chrome/test_371798.xul @@ -32,11 +32,11 @@ var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"]. var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"]. getService(Ci.nsINavBookmarksService); -// add 2 bookmarks to the toolbar, same URI, different titles +// add 2 bookmarks to the toolbar, same URI, different titles (set later) var toolbarFolderId = bmsvc.toolbarFolder; var testURI = uri("http://foo.com"); -var bm1 = bmsvc.insertItem(toolbarFolderId, testURI, bmsvc.DEFAULT_INDEX); -var bm2 = bmsvc.insertItem(toolbarFolderId, testURI, bmsvc.DEFAULT_INDEX); +var bm1 = bmsvc.insertBookmark(toolbarFolderId, testURI, bmsvc.DEFAULT_INDEX, ""); +var bm2 = bmsvc.insertBookmark(toolbarFolderId, testURI, bmsvc.DEFAULT_INDEX, ""); // query for bookmarks var options = histsvc.getNewQueryOptions(); diff --git a/mozilla/toolkit/components/places/tests/unit/test_annotations.js b/mozilla/toolkit/components/places/tests/unit/test_annotations.js index 060057502d3..e526e075217 100644 --- a/mozilla/toolkit/components/places/tests/unit/test_annotations.js +++ b/mozilla/toolkit/components/places/tests/unit/test_annotations.js @@ -93,7 +93,7 @@ var annoObserver = { // main function run_test() { var testURI = uri("http://mozilla.com/"); - var testItemId = bmsvc.insertItem(bmsvc.bookmarksRoot, testURI, -1); + var testItemId = bmsvc.insertBookmark(bmsvc.bookmarksRoot, testURI, -1, ""); var testAnnoName = "moz-test-places/annotations"; var testAnnoVal = "test"; @@ -148,7 +148,7 @@ function run_test() { do_check_true(pages[0].equals(uri2) || pages[1].equals(uri2)); // test getItemsWithAnnotation - var testItemId2 = bmsvc.insertItem(bmsvc.bookmarksRoot, uri2, -1); + var testItemId2 = bmsvc.insertBookmark(bmsvc.bookmarksRoot, uri2, -1, ""); annosvc.setItemAnnotationString(testItemId2, testAnnoName, testAnnoVal, 0, 0); var items = annosvc.getItemsWithAnnotation(testAnnoName, { }); do_check_eq(items.length, 2); diff --git a/mozilla/toolkit/components/places/tests/unit/test_result_sort.js b/mozilla/toolkit/components/places/tests/unit/test_result_sort.js index 0d0f4622d43..396e9efb3cd 100644 --- a/mozilla/toolkit/components/places/tests/unit/test_result_sort.js +++ b/mozilla/toolkit/components/places/tests/unit/test_result_sort.js @@ -78,14 +78,10 @@ function run_test() { bmsvc.DEFAULT_INDEX); var uri1 = uri("http://foo.tld/a"); var uri2 = uri("http://foo.tld/b"); - var id1 = bmsvc.insertItem(testRoot, uri1, bmsvc.DEFAULT_INDEX); - bmsvc.setItemTitle(id1, "b"); - var id2 = bmsvc.insertItem(testRoot, uri2, bmsvc.DEFAULT_INDEX); - bmsvc.setItemTitle(id2, "a"); - + var id1 = bmsvc.insertBookmark(testRoot, uri1, bmsvc.DEFAULT_INDEX, "b"); + var id2 = bmsvc.insertBookmark(testRoot, uri2, bmsvc.DEFAULT_INDEX, "a"); // url of id1, title of id2 - var id3 = bmsvc.insertItem(testRoot, uri1, bmsvc.DEFAULT_INDEX); - bmsvc.setItemTitle(id3, "a"); + var id3 = bmsvc.insertBookmark(testRoot, uri1, bmsvc.DEFAULT_INDEX, "a"); // query with natural order var options = histsvc.getNewQueryOptions();