wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 816903 - Remove calls to addVisits from Places tests. r=mak

Browse Source
This commit is contained in:
Raymond Lee 2013-01-31 15:10:46 +08:00
parent 67bfe8c0c4
commit c4c2fe11a4
20 changed files with 113 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
toolkit/components/places/tests/favicons/test_expireAllFavicons.js
View File

@ -32,22 +32,23 @@ add_test(function test_expireAllFavicons() {
}, PlacesUtils.TOPIC_FAVICONS_EXPIRED, false);
// Add a visited page.
addVisits({ uri: TEST_PAGE_URI, transition: TRANSITION_TYPED }, function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(TEST_PAGE_URI,
SMALLPNG_DATA_URI, true,
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE);
promiseAddVisits({ uri: TEST_PAGE_URI, transition: TRANSITION_TYPED }).then(
function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(TEST_PAGE_URI,
SMALLPNG_DATA_URI, true,
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE);
// Add a page with a bookmark.
PlacesUtils.bookmarks.insertBookmark(
PlacesUtils.toolbarFolderId, BOOKMARKED_PAGE_URI,
PlacesUtils.bookmarks.DEFAULT_INDEX,
"Test bookmark");
PlacesUtils.favicons.setAndFetchFaviconForPage(
BOOKMARKED_PAGE_URI, SMALLPNG_DATA_URI, true,
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
function () {
// Start expiration only after data has been saved in the database.
PlacesUtils.favicons.expireAllFavicons();
});
});
// Add a page with a bookmark.
PlacesUtils.bookmarks.insertBookmark(
PlacesUtils.toolbarFolderId, BOOKMARKED_PAGE_URI,
PlacesUtils.bookmarks.DEFAULT_INDEX,
"Test bookmark");
PlacesUtils.favicons.setAndFetchFaviconForPage(
BOOKMARKED_PAGE_URI, SMALLPNG_DATA_URI, true,
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
function () {
// Start expiration only after data has been saved in the database.
PlacesUtils.favicons.expireAllFavicons();
});
});
});

41
toolkit/components/places/tests/favicons/test_favicons_conversions.js
View File

@ -34,29 +34,30 @@ function checkFaviconDataConversion(aFileName, aFileMimeType, aFileLength,
aExpectConversion, aVaryOnWindows,
aCallback) {
let pageURI = NetUtil.newURI("http://places.test/page/" + aFileName);
addVisits({ uri: pageURI, transition: TRANSITION_TYPED }, function () {
let faviconURI = NetUtil.newURI("http://places.test/icon/" + aFileName);
let fileData = readFileOfLength(aFileName, aFileLength);
promiseAddVisits({ uri: pageURI, transition: TRANSITION_TYPED }).then(
function () {
let faviconURI = NetUtil.newURI("http://places.test/icon/" + aFileName);
let fileData = readFileOfLength(aFileName, aFileLength);
PlacesUtils.favicons.replaceFaviconData(faviconURI, fileData, fileData.length,
aFileMimeType);
PlacesUtils.favicons.setAndFetchFaviconForPage(pageURI, faviconURI, true,
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
function CFDC_verify(aURI, aDataLen, aData, aMimeType) {
if (!aExpectConversion) {
do_check_true(compareArrays(aData, fileData));
do_check_eq(aMimeType, aFileMimeType);
} else {
if (!aVaryOnWindows || !isWindows) {
let expectedFile = do_get_file("expected-" + aFileName + ".png");
do_check_true(compareArrays(aData, readFileData(expectedFile)));
PlacesUtils.favicons.replaceFaviconData(faviconURI, fileData, fileData.length,
aFileMimeType);
PlacesUtils.favicons.setAndFetchFaviconForPage(pageURI, faviconURI, true,
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
function CFDC_verify(aURI, aDataLen, aData, aMimeType) {
if (!aExpectConversion) {
do_check_true(compareArrays(aData, fileData));
do_check_eq(aMimeType, aFileMimeType);
} else {
if (!aVaryOnWindows || !isWindows) {
let expectedFile = do_get_file("expected-" + aFileName + ".png");
do_check_true(compareArrays(aData, readFileData(expectedFile)));
}
do_check_eq(aMimeType, "image/png");
}
do_check_eq(aMimeType, "image/png");
}
aCallback();
});
});
aCallback();
});
});
}
////////////////////////////////////////////////////////////////////////////////

2
toolkit/components/places/tests/favicons/test_getFaviconDataForPage.js
View File

@ -26,7 +26,7 @@ add_test(function test_normal()
{
let pageURI = NetUtil.newURI("http://example.com/normal");
addVisits(pageURI, function () {
promiseAddVisits(pageURI).then(function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(
pageURI, FAVICON_URI, true,
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,

2
toolkit/components/places/tests/favicons/test_getFaviconURLForPage.js
View File

@ -17,7 +17,7 @@ add_test(function test_normal()
{
let pageURI = NetUtil.newURI("http://example.com/normal");
addVisits(pageURI, function () {
promiseAddVisits(pageURI).then(function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(
pageURI, SMALLPNG_DATA_URI, true,
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,

17
toolkit/components/places/tests/head_common.js
View File

@ -912,23 +912,6 @@ function promiseAddVisits(aPlaceInfo)
return deferred.promise;
}
/**
* Asynchronously adds visits to a page, then either invokes a callback function
* on success, or reports a test error on failure.
*
* @deprecated Use promiseAddVisits instead.
*/
function addVisits(aPlaceInfo, aCallback, aStack)
{
let stack = aStack || Components.stack.caller;
promiseAddVisits(aPlaceInfo).then(
aCallback,
function addVisits_onFailure(ex) {
do_throw(ex, stack);
}
);
}
/**
* Asynchronously check a url is visited.
*

26
toolkit/components/places/tests/inline/test_autocomplete_functional.js
View File

@ -11,8 +11,8 @@ add_autocomplete_test([
function ()
{
Services.prefs.setBoolPref("browser.urlbar.autocomplete.enabled", false);
addVisits({ uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED });
}
]);
@ -23,8 +23,8 @@ add_autocomplete_test([
function ()
{
Services.prefs.setBoolPref("browser.urlbar.autoFill", false);
addVisits({ uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED });
}
]);
@ -37,7 +37,7 @@ add_autocomplete_test([
let places = [{ uri: NetUtil.newURI("http://visit1.mozilla.org") },
{ uri: NetUtil.newURI("http://visit2.mozilla.org"),
transition: TRANSITION_TYPED }];
addVisits(places);
promiseAddVisits(places);
}
]);
@ -47,7 +47,7 @@ add_autocomplete_test([
"visit1.mozilla.org/",
function ()
{
addVisits(NetUtil.newURI("http://www.visit1.mozilla.org"));
promiseAddVisits(NetUtil.newURI("http://www.visit1.mozilla.org"));
}
]);
@ -57,7 +57,7 @@ add_autocomplete_test([
"visit3.mozilla.org/",
function ()
{
addVisits(NetUtil.newURI("http://www.visit3.mozilla.org"));
promiseAddVisits(NetUtil.newURI("http://www.visit3.mozilla.org"));
}
]);
@ -67,7 +67,7 @@ add_autocomplete_test([
"www.me.mozilla.org/",
function ()
{
addVisits(NetUtil.newURI("http://www.me.mozilla.org"));
promiseAddVisits(NetUtil.newURI("http://www.me.mozilla.org"));
}
]);
@ -78,7 +78,7 @@ add_autocomplete_test([
function ()
{
addBookmark({ url: "http://bookmark1.mozilla.org/", });
addVisits(NetUtil.newURI("http://bookmark1.mozilla.org/foo"));
promiseAddVisits(NetUtil.newURI("http://bookmark1.mozilla.org/foo"));
}
]);
@ -91,7 +91,7 @@ add_autocomplete_test([
let places = [{ uri: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=delicious") },
{ uri: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=smokey") }];
addVisits(places);
promiseAddVisits(places);
}
]);
@ -104,7 +104,7 @@ add_autocomplete_test([
let places = [{ uri: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=delicious") },
{ uri: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=smokey") }];
addVisits(places);
promiseAddVisits(places);
}
]);
@ -114,7 +114,7 @@ add_autocomplete_test([
"smokey.mozilla.org/foo?bacon=delicious",
function ()
{
addVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious"));
promiseAddVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious"));
}
]);
@ -124,6 +124,6 @@ add_autocomplete_test([
"smokey.mozilla.org/foo?bacon=delicious#bar",
function ()
{
addVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious#bar"));
promiseAddVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious#bar"));
}
]);

24
toolkit/components/places/tests/inline/test_do_not_trim.js
View File

@ -10,8 +10,8 @@ add_autocomplete_test([
"mozilla.org ",
"mozilla.org ",
function () {
addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
}
]);
@ -20,8 +20,8 @@ add_autocomplete_test([
"mozilla.org/ ",
"mozilla.org/ ",
function () {
addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
}
]);
@ -30,8 +30,8 @@ add_autocomplete_test([
"mozilla.org/link ",
"mozilla.org/link ",
function () {
addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
}
]);
@ -40,8 +40,8 @@ add_autocomplete_test([
"mozilla.org/link/ ",
"mozilla.org/link/ ",
function () {
addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
}
]);
@ -51,8 +51,8 @@ add_autocomplete_test([
"moz illa ",
"moz illa ",
function () {
addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
}
]);
@ -61,7 +61,7 @@ add_autocomplete_test([
" mozilla",
" mozilla",
function () {
addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
}
]);

12
toolkit/components/places/tests/inline/test_trimming.js
View File

@ -138,8 +138,8 @@ add_autocomplete_test([
"https://www.mozilla.org/啊-test",
{ autoFilled: "https://www.mozilla.org/啊-test", completed: "https://www.mozilla.org/啊-test" },
function () {
addVisits({ uri: NetUtil.newURI("https://www.mozilla.org/啊-test"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("https://www.mozilla.org/啊-test"),
transition: TRANSITION_TYPED });
},
]);
@ -148,8 +148,8 @@ add_autocomplete_test([
"https://test.moz.org/t",
{ autoFilled: "https://test.moz.org/test/", completed: "https://test.moz.org/test/" },
function () {
addVisits({ uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED });
},
]);
@ -158,7 +158,7 @@ add_autocomplete_test([
"https://test.moz",
{ autoFilled: "https://test.moz.org/", completed: "https://test.moz.org/" },
function () {
addVisits({ uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED });
},
]);

16
toolkit/components/places/tests/inline/test_typed.js
View File

@ -11,7 +11,7 @@ add_autocomplete_test([
"mozilla.org/",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
addVisits(NetUtil.newURI("http://mozilla.org/link/"));
promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -21,7 +21,7 @@ add_autocomplete_test([
"mozilla.org/link/",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
addVisits(NetUtil.newURI("http://mozilla.org/link/"));
promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -33,7 +33,7 @@ add_autocomplete_test([
"moz",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
addVisits(NetUtil.newURI("http://mozilla.org/link/"));
promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -43,8 +43,8 @@ add_autocomplete_test([
"mozilla.org/",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
addVisits({ uri: NetUtil.newURI("http://mozilla.org/typed/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/typed/"),
transition: TRANSITION_TYPED });
}
]);
@ -54,7 +54,7 @@ add_autocomplete_test([
"mozilla.org/li",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
addVisits(NetUtil.newURI("http://mozilla.org/link/"));
promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -64,7 +64,7 @@ add_autocomplete_test([
"mozilla.org/link/",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
}
]);

8
toolkit/components/places/tests/inline/test_zero_frecency.js
View File

@ -10,8 +10,8 @@ add_autocomplete_test([
"moz",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
addVisits({ uri: NetUtil.newURI("http://mozilla.org/framed_link/"),
transition: TRANSITION_FRAMED_LINK });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/framed_link/"),
transition: TRANSITION_FRAMED_LINK });
}
]);
@ -21,7 +21,7 @@ add_autocomplete_test([
"mozilla.org/f",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
addVisits({ uri: NetUtil.newURI("http://mozilla.org/framed_link/"),
transition: TRANSITION_FRAMED_LINK });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/framed_link/"),
transition: TRANSITION_FRAMED_LINK });
}
]);

2
toolkit/components/places/tests/unit/test_413784.js
View File

@ -80,7 +80,7 @@ AutoCompleteInput.prototype = {
function run_test()
{
do_test_pending();
addVisits(url, continue_test);
promiseAddVisits(url).then(continue_test);
}
function continue_test()

2
toolkit/components/places/tests/unit/test_asyncExecuteLegacyQueries.js
View File

@ -9,7 +9,7 @@ let tests = [
function test_history_query() {
let uri = NetUtil.newURI("http://test.visit.mozilla.com/");
let title = "Test visit";
addVisits({ uri: uri, title: title }, function () {
promiseAddVisits({ uri: uri, title: title }).then(function () {
let options = PlacesUtils.history.getNewQueryOptions();
options.sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING;
let query = PlacesUtils.history.getNewQuery();

10
toolkit/components/places/tests/unit/test_browserhistory.js
View File

@ -9,7 +9,7 @@ const TEST_SUBDOMAIN_URI = NetUtil.newURI("http://foobar.mozilla.com/");
add_test(function test_addPage()
{
addVisits(TEST_URI, function () {
promiseAddVisits(TEST_URI).then(function () {
do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
run_next_test();
});
@ -29,7 +29,7 @@ add_test(function test_removePages()
pages.push(NetUtil.newURI(TEST_URI.spec + i));
}
addVisits(pages.map(function (uri) ({ uri: uri })), function () {
promiseAddVisits(pages.map(function (uri) ({ uri: uri }))).then(function () {
// Bookmarked item should not be removed from moz_places.
const ANNO_INDEX = 1;
const ANNO_NAME = "testAnno";
@ -77,7 +77,7 @@ add_test(function test_removePagesByTimeframe()
});
}
addVisits(visits, function () {
promiseAddVisits(visits).then(function () {
// Delete all pages except the first and the last.
PlacesUtils.bhistory.removePagesByTimeframe(startDate + 1, startDate + 8);
@ -96,7 +96,7 @@ add_test(function test_removePagesByTimeframe()
add_test(function test_removePagesFromHost()
{
addVisits(TEST_URI, function () {
promiseAddVisits(TEST_URI).then(function () {
PlacesUtils.bhistory.removePagesFromHost("mozilla.com", true);
do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
run_next_test();
@ -105,7 +105,7 @@ add_test(function test_removePagesFromHost()
add_test(function test_removePagesFromHost_keepSubdomains()
{
addVisits([{ uri: TEST_URI }, { uri: TEST_SUBDOMAIN_URI }], function () {
promiseAddVisits([{ uri: TEST_URI }, { uri: TEST_SUBDOMAIN_URI }]).then(function () {
PlacesUtils.bhistory.removePagesFromHost("mozilla.com", false);
do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
run_next_test();

2
toolkit/components/places/tests/unit/test_history_catobs.js
View File

@ -41,6 +41,6 @@ function run_test() {
do_test_pending();
// Add a visit
addVisits(uri("http://typed.mozilla.org"),
promiseAddVisits(uri("http://typed.mozilla.org")).then(
function () do_timeout(1000, verify));
}

6
toolkit/components/places/tests/unit/test_nsINavHistoryViewer.js
View File

@ -106,7 +106,7 @@ add_test(function check_history_query() {
// nsINavHistoryResultObserver.nodeInserted
// add a visit
addVisits(testURI, function() {
promiseAddVisits(testURI).then(function() {
do_check_eq(testURI.spec, resultObserver.insertedNode.uri);
// nsINavHistoryResultObserver.nodeHistoryDetailsChanged
@ -114,12 +114,12 @@ add_test(function check_history_query() {
do_check_eq(root.uri, resultObserver.nodeChangedByHistoryDetails.uri);
// nsINavHistoryResultObserver.itemTitleChanged for a leaf node
addVisits({ uri: testURI, title: "baz" }, function () {
promiseAddVisits({ uri: testURI, title: "baz" }).then(function () {
do_check_eq(resultObserver.nodeChangedByTitle.title, "baz");
// nsINavHistoryResultObserver.nodeRemoved
var removedURI = uri("http://google.com");
addVisits(removedURI, function() {
promiseAddVisits(removedURI).then(function() {
bhist.removePage(removedURI);
do_check_eq(removedURI.spec, resultObserver.removedNode.uri);

2
toolkit/components/places/tests/unit/test_placesTxn.js
View File

@ -639,7 +639,7 @@ add_test(function test_edit_item_last_modified() {
add_test(function test_generic_page_annotation() {
const TEST_ANNO = "testAnno/testInt";
let testURI = NetUtil.newURI("http://www.mozilla.org/");
addVisits(testURI, function () {
promiseAddVisits(testURI).then(function () {
let pageAnnoObj = { name: TEST_ANNO,
type: Ci.nsIAnnotationService.TYPE_INT32,
flags: 0,

2
toolkit/components/places/tests/unit/test_preventive_maintenance.js
View File

@ -1210,7 +1210,7 @@ tests.push({
desc: "recalculate hidden for redirects.",
setup: function() {
addVisits([
promiseAddVisits([
{ uri: NetUtil.newURI("http://l3.moz.org/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://l3.moz.org/redirecting/"),

24
toolkit/components/places/tests/unit/test_removeVisitsByTimeframe.js
View File

@ -22,7 +22,7 @@ var tests = [
for (let i = 0; i < 10; i++) {
visits.push({ uri: TEST_URI, visitDate: NOW - 1000 - i });
}
addVisits(visits, this.continue_run.bind(this));
promiseAddVisits(visits).then(this.continue_run.bind(this));
},
continue_run: function () {
print("Remove visits using timerange outside the URI's visits.");
@ -66,7 +66,7 @@ var tests = [
for (let i = 0; i < 10; i++) {
visits.push({ uri: TEST_URI, visitDate: NOW - 1000 - i });
}
addVisits(visits, function () {
promiseAddVisits(visits).then(function () {
print("Bookmark the URI.");
bmsvc.insertBookmark(bmsvc.unfiledBookmarksFolder,
TEST_URI,
@ -118,7 +118,7 @@ var tests = [
for (let i = 0; i < 10; i++) {
visits.push({ uri: TEST_URI, visitDate: NOW - i });
}
addVisits(visits, this.continue_run.bind(this));
promiseAddVisits(visits).then(this.continue_run.bind(this));
},
continue_run: function () {
print("Remove the 5 most recent visits.");
@ -163,7 +163,7 @@ var tests = [
for (let i = 0; i < 10; i++) {
visits.push({ uri: TEST_URI, visitDate: NOW - i });
}
addVisits(visits, function () {
promiseAddVisits(visits).then(function () {
print("Bookmark the URI.");
bmsvc.insertBookmark(bmsvc.unfiledBookmarksFolder,
TEST_URI,
@ -215,7 +215,7 @@ var tests = [
for (let i = 0; i < 10; i++) {
visits.push({ uri: TEST_URI, visitDate: NOW - i });
}
addVisits(visits, this.continue_run.bind(this));
promiseAddVisits(visits).then(this.continue_run.bind(this));
},
continue_run: function () {
print("Remove all visits.");
@ -250,7 +250,7 @@ var tests = [
for (let i = 0; i < 10; i++) {
visits.push({ uri: PLACE_URI, visitDate: NOW - i });
}
addVisits(visits, this.continue_run.bind(this));
promiseAddVisits(visits).then(this.continue_run.bind(this));
},
continue_run: function () {
print("Remove all visits.");
@ -290,7 +290,7 @@ var tests = [
for (let i = 0; i < 10; i++) {
visits.push({ uri: TEST_URI, visitDate: NOW - i });
}
addVisits(visits, function () {
promiseAddVisits(visits).then(function () {
print("Bookmark the URI.");
bmsvc.insertBookmark(bmsvc.unfiledBookmarksFolder,
TEST_URI,
@ -336,11 +336,11 @@ var tests = [
desc: "Remove some visits from a zero frecency URI retains zero frecency",
run: function () {
do_log_info("Add some visits for the URI.");
addVisits([{ uri: TEST_URI, transition: TRANSITION_FRAMED_LINK,
visitDate: (NOW - 86400000000) },
{ uri: TEST_URI, transition: TRANSITION_FRAMED_LINK,
visitDate: NOW }],
this.continue_run.bind(this));
promiseAddVisits([{ uri: TEST_URI, transition: TRANSITION_FRAMED_LINK,
visitDate: (NOW - 86400000000) },
{ uri: TEST_URI, transition: TRANSITION_FRAMED_LINK,
visitDate: NOW }]).then(
this.continue_run.bind(this));
},
continue_run: function () {
do_log_info("Remove newer visit.");

4
toolkit/components/places/tests/unit/test_resolveNullBookmarkTitles.js
View File

@ -12,10 +12,10 @@ add_test(function test_resolveNullBookmarkTitles() {
let uri1 = uri("http://foo.tld/");
let uri2 = uri("https://bar.tld/");
addVisits([
promiseAddVisits([
{ uri: uri1, title: "foo title" },
{ uri: uri2, title: "bar title" }
], function () {
]).then(function () {
PlacesUtils.bookmarks.insertBookmark(PlacesUtils.bookmarksMenuFolderId,
uri1,
PlacesUtils.bookmarks.DEFAULT_INDEX,

4
toolkit/components/places/tests/unit/test_update_frecency_after_delete.js
View File

@ -53,7 +53,7 @@ add_test(function removed_but_visited_bookmark()
do_log_info("Bookmarked => frecency of URI should be != 0");
do_check_neq(frecencyForUrl(TEST_URI), 0);
addVisits(TEST_URI, function () {
promiseAddVisits(TEST_URI).then(function () {
PlacesUtils.bookmarks.removeItem(id);
promiseAsyncUpdates().then(function ()
@ -113,7 +113,7 @@ add_test(function cleared_parent_of_visited_bookmark()
do_log_info("Bookmarked => frecency of URI should be != 0");
do_check_neq(frecencyForUrl(TEST_URI), 0);
addVisits(TEST_URI, function () {
promiseAddVisits(TEST_URI).then(function () {
PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
promiseAsyncUpdates().then(function ()