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 1129978 - sed -i '' 's/promiseAddVisits/PlacesTestUtils.addVisits/g' for toolkit/components/places r=mak

Browse Source
This commit is contained in:
Tim Taubert 2015-02-09 15:01:22 +01:00
parent 794c48ecf5
commit d3161e93c3
113 changed files with 773 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/components/places/tests/autocomplete/head_autocomplete.js
View File

@ -211,7 +211,7 @@ function task_addPageBook(aURI, aTitle, aBook, aTags, aKey, aTransitionType, aNo
// Add the page and a visit if we need to
if (!aNoVisit) {
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: uri,
transition: aTransitionType || TRANSITION_LINK,
visitDate: gDate,
@ -304,7 +304,7 @@ function markTyped(aURIs, aTitle)
function task_markTyped(aURIs, aTitle)
{
for (let uri of aURIs) {
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: toURI(kURIs[uri]),
transition: TRANSITION_TYPED,
title: kTitles[aTitle]

2
toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js
View File

@ -28,7 +28,7 @@ add_task(function test_autocomplete_on_value_removed()
// add history visit
var testUri = uri("http://foo.mozilla.com/");
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: testUri,
referrer: uri("http://mozilla.com/")
});

6
toolkit/components/places/tests/bookmarks/test_1017502-bookmarks_foreign_count.js
View File

@ -27,7 +27,7 @@ add_task(function* add_remove_change_bookmark_test() {
let conn = yield PlacesUtils.promiseDBConnection();
// Simulate a visit to the url
yield promiseAddVisits(T_URI);
yield PlacesTestUtils.addVisits(T_URI);
Assert.equal((yield getForeignCountForURL(conn, T_URI)), 0);
// Add 1st bookmark which should increment foreign_count by 1
@ -63,7 +63,7 @@ add_task(function* maintenance_foreign_count_test() {
let conn = yield PlacesUtils.promiseDBConnection();
// Simulate a visit to the url
yield promiseAddVisits(T_URI);
yield PlacesTestUtils.addVisits(T_URI);
// Adjust the foreign_count for the added entry to an incorrect value
let deferred = Promise.defer();
@ -93,7 +93,7 @@ add_task(function* maintenance_foreign_count_test() {
add_task(function* add_remove_tags_test(){
let conn = yield PlacesUtils.promiseDBConnection();
yield promiseAddVisits(T_URI);
yield PlacesTestUtils.addVisits(T_URI);
Assert.equal((yield getForeignCountForURL(conn, T_URI)), 0);
// Check foreign count incremented by 1 for a single tag

2
toolkit/components/places/tests/bookmarks/test_bookmarks.js
View File

@ -617,7 +617,7 @@ add_task(function test_bookmarks() {
// bug 378820
let uri1 = uri("http://foo.tld/a");
bs.insertBookmark(testRoot, uri1, bs.DEFAULT_INDEX, "");
yield promiseAddVisits(uri1);
yield PlacesTestUtils.addVisits(uri1);
// bug 646993 - test bookmark titles longer than the maximum allowed length
let title15 = Array(TITLE_LENGTH_MAX + 5).join("X");

4
toolkit/components/places/tests/bookmarks/test_bookmarks_eraseEverything.js
View File

@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
add_task(function* test_eraseEverything() {
yield promiseAddVisits({ uri: NetUtil.newURI("http://example.com/") });
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/") });
yield PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://example.com/") });
yield PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/") });
let frecencyForExample = frecencyForUrl("http://example.com/");
let frecencyForMozilla = frecencyForUrl("http://example.com/");
Assert.ok(frecencyForExample > 0);

6
toolkit/components/places/tests/bookmarks/test_getBookmarkedURIFor.js
View File

@ -19,7 +19,7 @@ add_task(function test_getBookmarkedURIFor() {
let now = Date.now() * 1000;
const sourceURI = uri("http://test.mozilla.org/");
// Add a visit and a bookmark.
yield promiseAddVisits({ uri: sourceURI, visitDate: now });
yield PlacesTestUtils.addVisits({ uri: sourceURI, visitDate: now });
do_check_eq(bs.getBookmarkedURIFor(sourceURI), null);
let sourceItemId = bs.insertBookmark(bs.unfiledBookmarksFolder,
@ -30,7 +30,7 @@ add_task(function test_getBookmarkedURIFor() {
// Add a redirected visit.
const permaURI = uri("http://perma.mozilla.org/");
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: permaURI,
transition: TRANSITION_REDIRECT_PERMANENT,
visitDate: now++,
@ -52,7 +52,7 @@ add_task(function test_getBookmarkedURIFor() {
// Add another redirected visit.
const tempURI = uri("http://perma.mozilla.org/");
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: tempURI,
transition: TRANSITION_REDIRECT_TEMPORARY,
visitDate: now++,

2
toolkit/components/places/tests/bookmarks/test_nsINavBookmarkObserver.js
View File

@ -273,7 +273,7 @@ add_test(function onItemMoved_bookmark() {
{ name: "parentGuid", check: function (v) typeof(v) == "string" && /^[a-zA-Z0-9\-_]{12}$/.test(v) },
] },
];
promiseAddVisits({ uri: uri, transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({ uri: uri, transition: TRANSITION_TYPED });
});
add_test(function onItemRemoved_bookmark() {

4
toolkit/components/places/tests/bookmarks/test_savedsearches.js
View File

@ -126,7 +126,7 @@ add_test(function test_savedsearches_bookmarks() {
add_task(function test_savedsearches_history() {
// add a visit that matches the search term
var testURI = uri("http://" + searchTerm + ".com");
yield promiseAddVisits({ uri: testURI, title: searchTerm });
yield PlacesTestUtils.addVisits({ uri: testURI, title: searchTerm });
// create a saved-search that matches the visit we added
var searchId = PlacesUtils.bookmarks.insertBookmark(testRoot,
@ -166,7 +166,7 @@ add_task(function test_savedsearches_history() {
do_check_eq(item.uri, testURI.spec); // history visit
// test live-update of query results - add a history visit that matches the query
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: uri("http://foo.com"),
title: searchTerm + "blah"
});

2
toolkit/components/places/tests/expiration/test_analyze_runs.js
View File

@ -64,7 +64,7 @@ add_task(function init_tests()
let bs = PlacesUtils.bookmarks;
bs.insertBookmark(PlacesUtils.unfiledBookmarksFolderId, TEST_URI,
bs.DEFAULT_INDEX, TEST_TITLE);
yield promiseAddVisits(TEST_URI);
yield PlacesTestUtils.addVisits(TEST_URI);
let thing = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteInput,
Ci.nsIAutoCompletePopup,

6
toolkit/components/places/tests/expiration/test_annos_expire_history.js
View File

@ -32,7 +32,7 @@ add_task(function test_annos_expire_history() {
let now = getExpirablePRTime();
for (let i = 0; i < 5; i++) {
let pageURI = uri("http://page_anno." + i + ".mozilla.org/");
yield promiseAddVisits({ uri: pageURI, visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: pageURI, visitDate: now++ });
as.setPageAnnotation(pageURI, "page_expire1", "test", 0, as.EXPIRE_WITH_HISTORY);
as.setPageAnnotation(pageURI, "page_expire2", "test", 0, as.EXPIRE_WITH_HISTORY);
}
@ -46,7 +46,7 @@ add_task(function test_annos_expire_history() {
for (let i = 0; i < 5; i++) {
let pageURI = uri("http://item_anno." + i + ".mozilla.org/");
// We also add a visit before bookmarking.
yield promiseAddVisits({ uri: pageURI, visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: pageURI, visitDate: now++ });
let id = bs.insertBookmark(bs.unfiledBookmarksFolder, pageURI,
bs.DEFAULT_INDEX, null);
// Notice we use page annotations here, items annotations can't use this
@ -64,7 +64,7 @@ add_task(function test_annos_expire_history() {
// We won't expire these visits, so the annotations should survive.
for (let i = 0; i < 5; i++) {
let pageURI = uri("http://persist_page_anno." + i + ".mozilla.org/");
yield promiseAddVisits({ uri: pageURI, visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: pageURI, visitDate: now++ });
as.setPageAnnotation(pageURI, "page_persist1", "test", 0, as.EXPIRE_WITH_HISTORY);
as.setPageAnnotation(pageURI, "page_persist2", "test", 0, as.EXPIRE_WITH_HISTORY);
}

6
toolkit/components/places/tests/expiration/test_annos_expire_never.js
View File

@ -35,7 +35,7 @@ add_task(function test_annos_expire_never() {
let now = getExpirablePRTime();
for (let i = 0; i < 5; i++) {
let pageURI = uri("http://page_anno." + i + ".mozilla.org/");
yield promiseAddVisits({ uri: pageURI, visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: pageURI, visitDate: now++ });
as.setPageAnnotation(pageURI, "page_expire1", "test", 0, as.EXPIRE_NEVER);
as.setPageAnnotation(pageURI, "page_expire2", "test", 0, as.EXPIRE_NEVER);
}
@ -49,7 +49,7 @@ add_task(function test_annos_expire_never() {
for (let i = 0; i < 5; i++) {
let pageURI = uri("http://item_anno." + i + ".mozilla.org/");
// We also add a visit before bookmarking.
yield promiseAddVisits({ uri: pageURI, visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: pageURI, visitDate: now++ });
let id = bs.insertBookmark(bs.unfiledBookmarksFolder, pageURI,
bs.DEFAULT_INDEX, null);
as.setItemAnnotation(id, "item_persist1", "test", 0, as.EXPIRE_NEVER);
@ -65,7 +65,7 @@ add_task(function test_annos_expire_never() {
// We won't expire these visits, so the annotations should survive.
for (let i = 0; i < 5; i++) {
let pageURI = uri("http://persist_page_anno." + i + ".mozilla.org/");
yield promiseAddVisits({ uri: pageURI, visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: pageURI, visitDate: now++ });
as.setPageAnnotation(pageURI, "page_persist1", "test", 0, as.EXPIRE_NEVER);
as.setPageAnnotation(pageURI, "page_persist2", "test", 0, as.EXPIRE_NEVER);
}

4
toolkit/components/places/tests/expiration/test_annos_expire_policy.js
View File

@ -88,7 +88,7 @@ add_task(function test_annos_expire_policy() {
// Add some bookmarked page and timed annotations for each.
for (let i = 0; i < 5; i++) {
let pageURI = uri("http://item_anno." + i + ".mozilla.org/");
yield promiseAddVisits({ uri: pageURI, visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: pageURI, visitDate: now++ });
let id = bs.insertBookmark(bs.unfiledBookmarksFolder, pageURI,
bs.DEFAULT_INDEX, null);
// Add a 6 days old anno.
@ -137,7 +137,7 @@ add_task(function test_annos_expire_policy() {
// Add some visited page and timed annotations for each.
for (let i = 0; i < 5; i++) {
let pageURI = uri("http://page_anno." + i + ".mozilla.org/");
yield promiseAddVisits({ uri: pageURI, visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: pageURI, visitDate: now++ });
// Add a 6 days old anno.
add_old_anno(pageURI, "persist_days", "test", as.EXPIRE_DAYS, 6);
// Add a 8 days old anno, modified 5 days ago.

2
toolkit/components/places/tests/expiration/test_annos_expire_session.js
View File

@ -27,7 +27,7 @@ add_task(function test_annos_expire_session() {
let now = Date.now() * 1000;
for (let i = 0; i < 10; i++) {
let pageURI = uri("http://session_page_anno." + i + ".mozilla.org/");
yield promiseAddVisits({ uri: pageURI, visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: pageURI, visitDate: now++ });
as.setPageAnnotation(pageURI, "test1", "test", 0, as.EXPIRE_SESSION);
as.setPageAnnotation(pageURI, "test2", "test", 0, as.EXPIRE_SESSION);
}

4
toolkit/components/places/tests/expiration/test_clearHistory.js
View File

@ -93,7 +93,7 @@ add_task(function test_historyClear() {
for (let i = 0; i < 5; i++) {
let pageURI = uri("http://item_anno." + i + ".mozilla.org/");
// This visit will be expired.
yield promiseAddVisits({ uri: pageURI });
yield PlacesTestUtils.addVisits({ uri: pageURI });
let id = bs.insertBookmark(bs.unfiledBookmarksFolder, pageURI,
bs.DEFAULT_INDEX, null);
// Will persist because it's an EXPIRE_NEVER item anno.
@ -117,7 +117,7 @@ add_task(function test_historyClear() {
// All page annotations related to these expired pages are expected to
// expire as well.
let pageURI = uri("http://page_anno." + i + ".mozilla.org/");
yield promiseAddVisits({ uri: pageURI });
yield PlacesTestUtils.addVisits({ uri: pageURI });
as.setPageAnnotation(pageURI, "expire", "test", 0, as.EXPIRE_NEVER);
as.setPageAnnotation(pageURI, "expire_session", "test", 0, as.EXPIRE_SESSION);
add_old_anno(pageURI, "expire_days", "test", as.EXPIRE_DAYS, 8);

48
toolkit/components/places/tests/expiration/test_debug_expiration.js
View File

@ -13,10 +13,14 @@ let gNow = getExpirablePRTime();
add_task(function test_expire_orphans()
{
// Add visits to 2 pages and force a orphan expiration. Visits should survive.
yield promiseAddVisits({ uri: uri("http://page1.mozilla.org/"),
visitDate: gNow++ });
yield promiseAddVisits({ uri: uri("http://page2.mozilla.org/"),
visitDate: gNow++ });
yield PlacesTestUtils.addVisits({
uri: uri("http://page1.mozilla.org/"),
visitDate: gNow++
});
yield PlacesTestUtils.addVisits({
uri: uri("http://page2.mozilla.org/"),
visitDate: gNow++
});
// Create a orphan place.
let id = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
NetUtil.newURI("http://page3.mozilla.org/"),
@ -38,10 +42,14 @@ add_task(function test_expire_orphans()
add_task(function test_expire_orphans_optionalarg()
{
// Add visits to 2 pages and force a orphan expiration. Visits should survive.
yield promiseAddVisits({ uri: uri("http://page1.mozilla.org/"),
visitDate: gNow++ });
yield promiseAddVisits({ uri: uri("http://page2.mozilla.org/"),
visitDate: gNow++ });
yield PlacesTestUtils.addVisits({
uri: uri("http://page1.mozilla.org/"),
visitDate: gNow++
});
yield PlacesTestUtils.addVisits({
uri: uri("http://page2.mozilla.org/"),
visitDate: gNow++
});
// Create a orphan place.
let id = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
NetUtil.newURI("http://page3.mozilla.org/"),
@ -64,10 +72,14 @@ add_task(function test_expire_limited()
{
// Add visits to 2 pages and force a single expiration.
// Only 1 page should survive.
yield promiseAddVisits({ uri: uri("http://page1.mozilla.org/"),
visitDate: gNow++ });
yield promiseAddVisits({ uri: uri("http://page2.mozilla.org/"),
visitDate: gNow++ });
yield PlacesTestUtils.addVisits({
uri: uri("http://page1.mozilla.org/"),
visitDate: gNow++
});
yield PlacesTestUtils.addVisits({
uri: uri("http://page2.mozilla.org/"),
visitDate: gNow++
});
// Expire now.
yield promiseForceExpirationStep(1);
@ -84,10 +96,14 @@ add_task(function test_expire_unlimited()
{
// Add visits to 2 pages and force a single expiration.
// Only 1 page should survive.
yield promiseAddVisits({ uri: uri("http://page1.mozilla.org/"),
visitDate: gNow++ });
yield promiseAddVisits({ uri: uri("http://page2.mozilla.org/"),
visitDate: gNow++ });
yield PlacesTestUtils.addVisits({
uri: uri("http://page1.mozilla.org/"),
visitDate: gNow++
});
yield PlacesTestUtils.addVisits({
uri: uri("http://page2.mozilla.org/"),
visitDate: gNow++
});
// Expire now.
yield promiseForceExpirationStep(-1);

2
toolkit/components/places/tests/expiration/test_notifications_onDeleteURI.js
View File

@ -63,7 +63,7 @@ add_task(function test_notifications_onDeleteURI() {
let now = getExpirablePRTime();
for (let i = 0; i < currentTest.addPages; i++) {
let page = "http://" + testIndex + "." + i + ".mozilla.org/";
yield promiseAddVisits({ uri: uri(page), visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: uri(page), visitDate: now++ });
}
// Setup bookmarks.

2
toolkit/components/places/tests/expiration/test_notifications_onDeleteVisits.js
View File

@ -81,7 +81,7 @@ add_task(function test_notifications_onDeleteVisits() {
for (let j = 0; j < currentTest.visitsPerPage; j++) {
for (let i = 0; i < currentTest.addPages; i++) {
let page = "http://" + testIndex + "." + i + ".mozilla.org/";
yield promiseAddVisits({ uri: uri(page), visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: uri(page), visitDate: now++ });
}
}

2
toolkit/components/places/tests/expiration/test_pref_maxpages.js
View File

@ -84,7 +84,7 @@ add_task(function test_pref_maxpages() {
let now = getExpirablePRTime();
for (let i = 0; i < currentTest.addPages; i++) {
let page = "http://" + testIndex + "." + i + ".mozilla.org/";
yield promiseAddVisits({ uri: uri(page), visitDate: now++ });
yield PlacesTestUtils.addVisits({ uri: uri(page), visitDate: now++ });
}
// Observe history.

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

@ -32,7 +32,7 @@ add_test(function test_expireAllFavicons() {
}, PlacesUtils.TOPIC_FAVICONS_EXPIRED, false);
// Add a visited page.
promiseAddVisits({ uri: TEST_PAGE_URI, transition: TRANSITION_TYPED }).then(
PlacesTestUtils.addVisits({ uri: TEST_PAGE_URI, transition: TRANSITION_TYPED }).then(
function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(TEST_PAGE_URI,
SMALLPNG_DATA_URI, true,

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

@ -34,7 +34,7 @@ function checkFaviconDataConversion(aFileName, aFileMimeType, aFileLength,
aExpectConversion, aVaryOnWindows,
aCallback) {
let pageURI = NetUtil.newURI("http://places.test/page/" + aFileName);
promiseAddVisits({ uri: pageURI, transition: TRANSITION_TYPED }).then(
PlacesTestUtils.addVisits({ uri: pageURI, transition: TRANSITION_TYPED }).then(
function () {
let faviconURI = NetUtil.newURI("http://places.test/icon/" + aFileName);
let fileData = readFileOfLength(aFileName, aFileLength);

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");
promiseAddVisits(pageURI).then(function () {
PlacesTestUtils.addVisits(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");
promiseAddVisits(pageURI).then(function () {
PlacesTestUtils.addVisits(pageURI).then(function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(
pageURI, SMALLPNG_DATA_URI, true,
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,

10
toolkit/components/places/tests/favicons/test_replaceFaviconData.js
View File

@ -62,7 +62,7 @@ add_task(function test_replaceFaviconData_validHistoryURI() {
do_print("test replaceFaviconData for valid history uri");
let pageURI = uri("http://test1.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let favicon = createFavicon("favicon1.png");
@ -90,7 +90,7 @@ add_task(function test_replaceFaviconData_overrideDefaultFavicon() {
do_print("test replaceFaviconData to override a later setAndFetchFaviconForPage");
let pageURI = uri("http://test2.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let firstFavicon = createFavicon("favicon2.png");
let secondFavicon = createFavicon("favicon3.png");
@ -122,7 +122,7 @@ add_task(function test_replaceFaviconData_replaceExisting() {
do_print("test replaceFaviconData to override a previous setAndFetchFaviconForPage");
let pageURI = uri("http://test3.bar");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let firstFavicon = createFavicon("favicon4.png");
let secondFavicon = createFavicon("favicon5.png");
@ -159,7 +159,7 @@ add_task(function test_replaceFaviconData_unrelatedReplace() {
do_print("test replaceFaviconData to not make unrelated changes");
let pageURI = uri("http://test4.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let favicon = createFavicon("favicon6.png");
let unrelatedFavicon = createFavicon("favicon7.png");
@ -231,7 +231,7 @@ add_task(function test_replaceFaviconData_twiceReplace() {
do_print("test replaceFaviconData on multiple replacements");
let pageURI = uri("http://test5.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let firstFavicon = createFavicon("favicon9.png");
let secondFavicon = createFavicon("favicon10.png");

14
toolkit/components/places/tests/favicons/test_replaceFaviconDataFromDataURL.js
View File

@ -66,7 +66,7 @@ add_task(function test_replaceFaviconDataFromDataURL_validHistoryURI() {
do_print("test replaceFaviconDataFromDataURL for valid history uri");
let pageURI = uri("http://test1.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let favicon = createFavicon("favicon1.png");
iconsvc.replaceFaviconDataFromDataURL(favicon.uri, createDataURLForFavicon(favicon));
@ -92,7 +92,7 @@ add_task(function test_replaceFaviconDataFromDataURL_overrideDefaultFavicon() {
do_print("test replaceFaviconDataFromDataURL to override a later setAndFetchFaviconForPage");
let pageURI = uri("http://test2.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let firstFavicon = createFavicon("favicon2.png");
let secondFavicon = createFavicon("favicon3.png");
@ -122,7 +122,7 @@ add_task(function test_replaceFaviconDataFromDataURL_replaceExisting() {
do_print("test replaceFaviconDataFromDataURL to override a previous setAndFetchFaviconForPage");
let pageURI = uri("http://test3.bar");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let firstFavicon = createFavicon("favicon4.png");
let secondFavicon = createFavicon("favicon5.png");
@ -155,7 +155,7 @@ add_task(function test_replaceFaviconDataFromDataURL_unrelatedReplace() {
do_print("test replaceFaviconDataFromDataURL to not make unrelated changes");
let pageURI = uri("http://test4.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let favicon = createFavicon("favicon6.png");
let unrelatedFavicon = createFavicon("favicon7.png");
@ -213,7 +213,7 @@ add_task(function test_replaceFaviconDataFromDataURL_twiceReplace() {
do_print("test replaceFaviconDataFromDataURL on multiple replacements");
let pageURI = uri("http://test5.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let firstFavicon = createFavicon("favicon9.png");
let secondFavicon = createFavicon("favicon10.png");
@ -244,7 +244,7 @@ add_task(function test_replaceFaviconDataFromDataURL_afterRegularAssign() {
do_print("test replaceFaviconDataFromDataURL after replaceFaviconData");
let pageURI = uri("http://test6.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let firstFavicon = createFavicon("favicon11.png");
let secondFavicon = createFavicon("favicon12.png");
@ -277,7 +277,7 @@ add_task(function test_replaceFaviconDataFromDataURL_beforeRegularAssign() {
do_print("test replaceFaviconDataFromDataURL before replaceFaviconData");
let pageURI = uri("http://test7.bar/");
yield promiseAddVisits(pageURI);
yield PlacesTestUtils.addVisits(pageURI);
let firstFavicon = createFavicon("favicon13.png");
let secondFavicon = createFavicon("favicon14.png");

8
toolkit/components/places/tests/history/test_remove.js
View File

@ -14,7 +14,7 @@ Cu.importGlobalProperties(["URL"]);
// Test removing a single page
add_task(function* test_remove_single() {
let WITNESS_URI = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove/" + Math.random());
yield promiseAddVisits(WITNESS_URI);
yield PlacesTestUtils.addVisits(WITNESS_URI);
Assert.ok(page_in_database(WITNESS_URI));
let remover = Task.async(function*(name, filter, options) {
@ -24,7 +24,7 @@ add_task(function* test_remove_single() {
let uri = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove/" + Math.random());
let title = "Visit " + Math.random();
yield promiseAddVisits({uri: uri, title: title});
yield PlacesTestUtils.addVisits({uri: uri, title: title});
Assert.ok(visits_in_database(uri), "History entry created");
let removeArg = yield filter(uri);
@ -141,7 +141,7 @@ add_task(function* test_remove_many() {
do_print("Adding a witness page");
let WITNESS_URI = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove/" + Math.random());;
yield promiseAddVisits(WITNESS_URI);
yield PlacesTestUtils.addVisits(WITNESS_URI);
Assert.ok(page_in_database(WITNESS_URI), "Witness page added");
do_print("Generating samples");
@ -167,7 +167,7 @@ add_task(function* test_remove_many() {
do_print("Pushing: " + uri.spec);
pages.push(page);
yield promiseAddVisits(page);
yield PlacesTestUtils.addVisits(page);
page.guid = do_get_guid_for_uri(uri);
if (hasBookmark) {
PlacesUtils.bookmarks.insertBookmark(

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

@ -11,8 +11,10 @@ add_autocomplete_test([
function ()
{
Services.prefs.setBoolPref("browser.urlbar.autocomplete.enabled", false);
promiseAddVisits({ uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED
});
}
]);
@ -23,8 +25,10 @@ add_autocomplete_test([
function ()
{
Services.prefs.setBoolPref("browser.urlbar.autoFill", false);
promiseAddVisits({ uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED
});
}
]);
@ -37,7 +41,7 @@ add_autocomplete_test([
let places = [{ uri: NetUtil.newURI("http://visit1.mozilla.org") },
{ uri: NetUtil.newURI("http://visit2.mozilla.org"),
transition: TRANSITION_TYPED }];
promiseAddVisits(places);
PlacesTestUtils.addVisits(places);
}
]);
@ -47,7 +51,7 @@ add_autocomplete_test([
"visit1.mozilla.org/",
function ()
{
promiseAddVisits(NetUtil.newURI("http://www.visit1.mozilla.org"));
PlacesTestUtils.addVisits(NetUtil.newURI("http://www.visit1.mozilla.org"));
}
]);
@ -57,7 +61,7 @@ add_autocomplete_test([
"visit3.mozilla.org/",
function ()
{
promiseAddVisits(NetUtil.newURI("http://www.visit3.mozilla.org"));
PlacesTestUtils.addVisits(NetUtil.newURI("http://www.visit3.mozilla.org"));
}
]);
@ -67,7 +71,7 @@ add_autocomplete_test([
"www.me.mozilla.org/",
function ()
{
promiseAddVisits(NetUtil.newURI("http://www.me.mozilla.org"));
PlacesTestUtils.addVisits(NetUtil.newURI("http://www.me.mozilla.org"));
}
]);
@ -78,7 +82,7 @@ add_autocomplete_test([
function ()
{
addBookmark({ url: "http://bookmark1.mozilla.org/", });
promiseAddVisits(NetUtil.newURI("http://bookmark1.mozilla.org/foo"));
PlacesTestUtils.addVisits(NetUtil.newURI("http://bookmark1.mozilla.org/foo"));
}
]);
@ -91,7 +95,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") }];
promiseAddVisits(places);
PlacesTestUtils.addVisits(places);
}
]);
@ -104,7 +108,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") }];
promiseAddVisits(places);
PlacesTestUtils.addVisits(places);
}
]);
@ -114,7 +118,7 @@ add_autocomplete_test([
"smokey.mozilla.org/foo?bacon=delicious",
function ()
{
promiseAddVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious"));
PlacesTestUtils.addVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious"));
}
]);
@ -124,6 +128,6 @@ add_autocomplete_test([
"smokey.mozilla.org/foo?bacon=delicious#bar",
function ()
{
promiseAddVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious#bar"));
PlacesTestUtils.addVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious#bar"));
}
]);

22
toolkit/components/places/tests/inline/test_casing.js
View File

@ -7,7 +7,7 @@ add_autocomplete_test([
"MOZ",
{ autoFilled: "MOZilla.org/", completed: "mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/test/") });
}
]);
@ -16,7 +16,7 @@ add_autocomplete_test([
"mozilla.org/T",
{ autoFilled: "mozilla.org/T", completed: "mozilla.org/T" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/test/") });
}
]);
@ -25,7 +25,7 @@ add_autocomplete_test([
"mozilla.org/T",
{ autoFilled: "mozilla.org/Test/", completed: "http://mozilla.org/Test/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
}
]);
@ -34,7 +34,7 @@ add_autocomplete_test([
"mOzilla.org/t",
{ autoFilled: "mOzilla.org/t", completed: "mOzilla.org/t" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
},
]);
@ -43,7 +43,7 @@ add_autocomplete_test([
"mOzilla.org/T",
{ autoFilled: "mOzilla.org/Test/", completed: "http://mozilla.org/Test/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
},
]);
@ -52,7 +52,7 @@ add_autocomplete_test([
"http://mOz",
{ autoFilled: "http://mOzilla.org/", completed: "http://mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
},
]);
@ -61,7 +61,7 @@ add_autocomplete_test([
"http://www.mOz",
{ autoFilled: "http://www.mOzilla.org/", completed: "http://www.mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/Test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://www.mozilla.org/Test/") });
},
]);
@ -70,7 +70,7 @@ add_autocomplete_test([
"http://mOzilla.org/t",
{ autoFilled: "http://mOzilla.org/t", completed: "http://mOzilla.org/t" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
},
]);
@ -79,7 +79,7 @@ add_autocomplete_test([
"http://mOzilla.org/T",
{ autoFilled: "http://mOzilla.org/Test/", completed: "http://mozilla.org/Test/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/") });
},
]);
@ -88,7 +88,7 @@ add_autocomplete_test([
"http://www.mOzilla.org/t",
{ autoFilled: "http://www.mOzilla.org/t", completed: "http://www.mOzilla.org/t" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/Test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://www.mozilla.org/Test/") });
},
]);
@ -97,6 +97,6 @@ add_autocomplete_test([
"http://www.mOzilla.org/T",
{ autoFilled: "http://www.mOzilla.org/Test/", completed: "http://www.mozilla.org/Test/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/Test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://www.mozilla.org/Test/") });
},
]);

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

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

42
toolkit/components/places/tests/inline/test_queryurl.js
View File

@ -7,11 +7,13 @@ add_autocomplete_test([
"file",
"file.org/",
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED }
);
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED
}, {
uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED
});
},
]);
@ -20,11 +22,13 @@ add_autocomplete_test([
"file.org/",
"file.org/",
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED }
);
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED
}, {
uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED
});
},
]);
@ -33,11 +37,13 @@ add_autocomplete_test([
"file.org/t",
"file.org/test/",
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED }
);
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED
}, {
uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED
});
},
]);
@ -46,7 +52,9 @@ add_autocomplete_test([
"file",
"file",
function () {
promiseAddVisits({ uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED
});
},
]);

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

@ -7,8 +7,10 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "https://www.mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -17,8 +19,10 @@ add_autocomplete_test([
"mozilla.org/t",
{ autoFilled: "mozilla.org/test/", completed: "https://www.mozilla.org/test/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -27,8 +31,10 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "https://mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -37,8 +43,10 @@ add_autocomplete_test([
"mozilla.org/t",
{ autoFilled: "mozilla.org/test/", completed: "https://mozilla.org/test/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -47,8 +55,10 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "www.mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -57,8 +67,10 @@ add_autocomplete_test([
"mozilla.org/t",
{ autoFilled: "mozilla.org/test/", completed: "http://www.mozilla.org/test/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -67,8 +79,10 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "ftp://mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -77,8 +91,10 @@ add_autocomplete_test([
"mozilla.org/t",
{ autoFilled: "mozilla.org/test/", completed: "ftp://mozilla.org/test/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -87,16 +103,26 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -105,14 +131,22 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -121,12 +155,18 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -135,10 +175,14 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -147,10 +191,14 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "ftp://mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("ftp://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("ftp://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -159,10 +207,14 @@ add_autocomplete_test([
"mo",
{ autoFilled: "mozilla.org/", completed: "www.mozilla.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test1/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test2/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test1/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test2/"),
transition: TRANSITION_TYPED
});
},
]);
@ -173,12 +225,18 @@ add_autocomplete_test([
function () {
// The .co should be preferred, but should not get the https from the .com.
// The .co domain must be added later to activate the trigger bug.
promiseAddVisits({ uri: NetUtil.newURI("https://mozilla.com/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.co/"),
transition: TRANSITION_TYPED });
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.co/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://mozilla.com/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.co/"),
transition: TRANSITION_TYPED
});
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.co/"),
transition: TRANSITION_TYPED
});
},
]);
@ -187,8 +245,10 @@ add_autocomplete_test([
"https://www.mozilla.org/啊-test",
{ autoFilled: "https://www.mozilla.org/啊-test", completed: "https://www.mozilla.org/啊-test" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("https://www.mozilla.org/啊-test"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://www.mozilla.org/啊-test"),
transition: TRANSITION_TYPED
});
},
]);
@ -197,8 +257,10 @@ add_autocomplete_test([
"https://test.moz.org/t",
{ autoFilled: "https://test.moz.org/test/", completed: "https://test.moz.org/test/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -207,8 +269,10 @@ add_autocomplete_test([
"https://test.moz",
{ autoFilled: "https://test.moz.org/", completed: "https://test.moz.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED });
PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED
});
},
]);
@ -217,7 +281,7 @@ add_autocomplete_test([
"mo",
{ autoFilled: "moz.org/", completed: "moz.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("http://www.moz.org/test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://www.moz.org/test/") });
},
]);
@ -226,7 +290,7 @@ add_autocomplete_test([
"mo",
{ autoFilled: "moz.org/", completed: "moz.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("ftp://moz.org/test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("ftp://moz.org/test/") });
},
]);
@ -235,7 +299,7 @@ add_autocomplete_test([
"mo",
{ autoFilled: "moz.org/", completed: "moz.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("https://moz.org/test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("https://moz.org/test/") });
},
]);
@ -244,6 +308,6 @@ add_autocomplete_test([
"mo",
{ autoFilled: "moz.org/", completed: "moz.org/" },
function () {
promiseAddVisits({ uri: NetUtil.newURI("https://www.moz.org/test/") });
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("https://www.moz.org/test/") });
},
]);

12
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);
promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
PlacesTestUtils.addVisits(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);
promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
PlacesTestUtils.addVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -33,7 +33,7 @@ add_autocomplete_test([
"moz",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
PlacesTestUtils.addVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -43,7 +43,7 @@ add_autocomplete_test([
"mozilla.org/",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/typed/"),
PlacesTestUtils.addVisits({ 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);
promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
PlacesTestUtils.addVisits(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);
promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
}
]);

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

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

4
toolkit/components/places/tests/queries/head_queries.js
View File

@ -49,7 +49,7 @@ function task_populateDB(aArray)
var qdata = new queryData(data);
if (qdata.isVisit) {
// Then we should add a visit for this node
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: uri(qdata.uri),
transition: qdata.transType,
visitDate: qdata.lastVisit,
@ -94,7 +94,7 @@ function task_populateDB(aArray)
if (qdata.isDetails) {
// Then we add extraneous page details for testing
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: uri(qdata.uri),
visitDate: qdata.lastVisit,
title: qdata.title

2
toolkit/components/places/tests/queries/test_415716.js
View File

@ -62,7 +62,7 @@ add_task(function test_buildTestDatabase()
});
}
yield promiseAddVisits(places);
yield PlacesTestUtils.addVisits(places);
PlacesUtils.annotations.setPageAnnotation(testURI, testAnnoName,
testAnnoVal, 0, 0);

24
toolkit/components/places/tests/queries/test_history_queries_titles_liveUpdate.js
View File

@ -61,9 +61,9 @@ add_task(function pages_query()
let node = root.getChild(i);
do_check_eq(node.title, gTestData[i].title);
let uri = NetUtil.newURI(node.uri);
yield promiseAddVisits({uri: uri, title: "changedTitle"});
yield PlacesTestUtils.addVisits({uri: uri, title: "changedTitle"});
do_check_eq(node.title, "changedTitle");
yield promiseAddVisits({uri: uri, title: gTestData[i].title});
yield PlacesTestUtils.addVisits({uri: uri, title: gTestData[i].title});
do_check_eq(node.title, gTestData[i].title);
}
@ -86,10 +86,10 @@ add_task(function visits_query()
let uri = NetUtil.newURI(testData.uri);
let node = searchNodeHavingUrl(root, testData.uri);
do_check_eq(node.title, testData.title);
yield promiseAddVisits({uri: uri, title: "changedTitle"});
yield PlacesTestUtils.addVisits({uri: uri, title: "changedTitle"});
node = searchNodeHavingUrl(root, testData.uri);
do_check_eq(node.title, "changedTitle");
yield promiseAddVisits({uri: uri, title: testData.title});
yield PlacesTestUtils.addVisits({uri: uri, title: testData.title});
node = searchNodeHavingUrl(root, testData.uri);
do_check_eq(node.title, testData.title);
}
@ -112,9 +112,9 @@ add_task(function pages_searchterm_query()
let node = root.getChild(i);
let uri = NetUtil.newURI(node.uri);
do_check_eq(node.title, gTestData[i].title);
yield promiseAddVisits({uri: uri, title: "changedTitle"});
yield PlacesTestUtils.addVisits({uri: uri, title: "changedTitle"});
do_check_eq(node.title, "changedTitle");
yield promiseAddVisits({uri: uri, title: gTestData[i].title});
yield PlacesTestUtils.addVisits({uri: uri, title: gTestData[i].title});
do_check_eq(node.title, gTestData[i].title);
}
@ -137,10 +137,10 @@ add_task(function visits_searchterm_query()
let uri = NetUtil.newURI(testData.uri);
let node = searchNodeHavingUrl(root, testData.uri);
do_check_eq(node.title, testData.title);
yield promiseAddVisits({uri: uri, title: "changedTitle"});
yield PlacesTestUtils.addVisits({uri: uri, title: "changedTitle"});
node = searchNodeHavingUrl(root, testData.uri);
do_check_eq(node.title, "changedTitle");
yield promiseAddVisits({uri: uri, title: testData.title});
yield PlacesTestUtils.addVisits({uri: uri, title: testData.title});
node = searchNodeHavingUrl(root, testData.uri);
do_check_eq(node.title, testData.title);
}
@ -162,10 +162,10 @@ add_task(function pages_searchterm_is_title_query()
let uri = NetUtil.newURI(data.uri);
let origTitle = data.title;
data.title = "match";
yield promiseAddVisits({uri: uri, title: data.title});
yield PlacesTestUtils.addVisits({uri: uri, title: data.title});
compareArrayToResult([data], root);
data.title = origTitle;
yield promiseAddVisits({uri: uri, title: data.title});
yield PlacesTestUtils.addVisits({uri: uri, title: data.title});
compareArrayToResult([], root);
});
@ -187,10 +187,10 @@ add_task(function visits_searchterm_is_title_query()
let uri = NetUtil.newURI(data.uri);
let origTitle = data.title;
data.title = "match";
yield promiseAddVisits({uri: uri, title: data.title});
yield PlacesTestUtils.addVisits({uri: uri, title: data.title});
compareArrayToResult([data], root);
data.title = origTitle;
yield promiseAddVisits({uri: uri, title: data.title});
yield PlacesTestUtils.addVisits({uri: uri, title: data.title});
compareArrayToResult([], root);
});

2
toolkit/components/places/tests/queries/test_sorting.js
View File

@ -414,7 +414,7 @@ tests.push({
// This function in head_queries.js creates our database with the above data
yield task_populateDB(this._unsortedData);
// add visits to increase visit count
yield promiseAddVisits([
yield PlacesTestUtils.addVisits([
{ uri: uri("http://example.com/a"), transition: TRANSITION_TYPED, visitDate: timeInMicroseconds },
{ uri: uri("http://example.com/b1"), transition: TRANSITION_TYPED, visitDate: timeInMicroseconds },
{ uri: uri("http://example.com/b1"), transition: TRANSITION_TYPED, visitDate: timeInMicroseconds },

6
toolkit/components/places/tests/queries/test_tags.js
View File

@ -322,7 +322,7 @@
do_print("Add visits and tag the URIs");
for (let [pURI, tags] in Iterator(urisAndTags)) {
let nsiuri = uri(pURI);
yield promiseAddVisits(nsiuri);
yield PlacesTestUtils.addVisits(nsiuri);
if (tags)
PlacesUtils.tagging.tagURI(nsiuri, tags);
}
@ -493,7 +493,7 @@
do_print("Add visits and tag the URIs");
for (let [pURI, tags] in Iterator(urisAndTags)) {
let nsiuri = uri(pURI);
yield promiseAddVisits(nsiuri);
yield PlacesTestUtils.addVisits(nsiuri);
if (tags)
PlacesUtils.tagging.tagURI(nsiuri, tags);
}
@ -629,7 +629,7 @@ function task_doWithBookmark(aTags, aCallback) {
* A function that will be called after the visit has been tagged
*/
function task_doWithVisit(aTags, aCallback) {
yield promiseAddVisits(TEST_URI);
yield PlacesTestUtils.addVisits(TEST_URI);
PlacesUtils.tagging.tagURI(TEST_URI, aTags);
yield aCallback(TEST_URI);
PlacesUtils.tagging.untagURI(TEST_URI, aTags);

4
toolkit/components/places/tests/queries/test_transitions.js
View File

@ -97,7 +97,7 @@ add_task(function test_transitions()
{
let timeNow = Date.now();
for each (let item in testData) {
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: uri(item.uri),
transition: item.transType,
visitDate: timeNow++ * 1000,
@ -150,7 +150,7 @@ add_task(function test_transitions()
var root = result.root;
root.containerOpen = true;
do_check_eq(testDataDownload.length, root.childCount);
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: uri("http://getfirefox.com"),
transition: TRANSITION_DOWNLOAD
});

2
toolkit/components/places/tests/unifiedcomplete/test_416211.js
View File

@ -10,7 +10,7 @@
add_task(function* test_tag_match_has_bookmark_title() {
do_print("Make sure the tag match gives the bookmark title");
let uri = NetUtil.newURI("http://theuri/");
yield promiseAddVisits({ uri: uri, title: "Page title" });
yield PlacesTestUtils.addVisits({ uri: uri, title: "Page title" });
addBookmark({ uri: uri,
title: "Bookmark title",
tags: [ "superTag" ]});

6
toolkit/components/places/tests/unifiedcomplete/test_416214.js
View File

@ -18,8 +18,10 @@ add_task(function* test_tag_match_url() {
do_print("Make sure tag matches return the right url as well as '+' remain escaped");
let uri1 = NetUtil.newURI("http://escaped/ユニコード");
let uri2 = NetUtil.newURI("http://asciiescaped/blocking-firefox3%2B");
yield promiseAddVisits([ { uri: uri1, title: "title" },
{ uri: uri2, title: "title" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "title" },
{ uri: uri2, title: "title" }
]);
addBookmark({ uri: uri1,
title: "title",
tags: [ "superTag" ],

2
toolkit/components/places/tests/unifiedcomplete/test_417798.js
View File

@ -12,7 +12,7 @@ add_task(function* test_javascript_match() {
let uri1 = NetUtil.newURI("http://abc/def");
let uri2 = NetUtil.newURI("javascript:5");
yield promiseAddVisits([ { uri: uri1, title: "Title with javascript:" } ]);
yield PlacesTestUtils.addVisits([ { uri: uri1, title: "Title with javascript:" } ]);
addBookmark({ uri: uri2,
title: "Title with javascript:" });

10
toolkit/components/places/tests/unifiedcomplete/test_418257.js
View File

@ -13,10 +13,12 @@ add_task(function* test_javascript_match() {
let uri2 = NetUtil.newURI("http://page2");
let uri3 = NetUtil.newURI("http://page3");
let uri4 = NetUtil.newURI("http://page4");
yield promiseAddVisits([ { uri: uri1, title: "tagged" },
{ uri: uri2, title: "tagged" },
{ uri: uri3, title: "tagged" },
{ uri: uri4, title: "tagged" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "tagged" },
{ uri: uri2, title: "tagged" },
{ uri: uri3, title: "tagged" },
{ uri: uri4, title: "tagged" }
]);
addBookmark({ uri: uri1,
title: "tagged",
tags: [ "tag1" ] });

2
toolkit/components/places/tests/unifiedcomplete/test_422277.js
View File

@ -10,7 +10,7 @@
add_task(function* test_javascript_match() {
do_print("Bad escaped uri stays escaped");
let uri1 = NetUtil.newURI("http://site/%EAid");
yield promiseAddVisits([ { uri: uri1, title: "title" } ]);
yield PlacesTestUtils.addVisits([ { uri: uri1, title: "title" } ]);
yield check_autocomplete({
search: "site",
matches: [ { uri: uri1, title: "title" } ]

4
toolkit/components/places/tests/unifiedcomplete/test_autoFill_default_behavior.js
View File

@ -13,7 +13,7 @@ add_task(function* test_default_behavior_host() {
let uri4 = NetUtil.newURI("http://tpbk/");
let uri5 = NetUtil.newURI("http://tagged/");
yield promiseAddVisits([
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "typed", transition: TRANSITION_TYPED },
{ uri: uri2, title: "visited" },
{ uri: uri4, title: "tpbk", transition: TRANSITION_TYPED },
@ -195,7 +195,7 @@ add_task(function* test_default_behavior_url() {
let uri3 = NetUtil.newURI("http://bookmarked/bo/");
let uri4 = NetUtil.newURI("http://tpbk/tp/");
yield promiseAddVisits([
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "typed", transition: TRANSITION_TYPED },
{ uri: uri2, title: "visited" },
{ uri: uri4, title: "tpbk", transition: TRANSITION_TYPED },

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

@ -9,8 +9,10 @@ const PREF_AUTOCOMPLETE_ENABLED = "browser.urlbar.autocomplete.enabled";
add_task(function* test_disabling_autocomplete() {
do_print("Check disabling autocomplete disables autofill");
Services.prefs.setBoolPref(PREF_AUTOCOMPLETE_ENABLED, false);
yield promiseAddVisits({ uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://visit.mozilla.org"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "vis",
autofilled: "vis",
@ -24,7 +26,7 @@ add_task(function* test_urls_order() {
let places = [{ uri: NetUtil.newURI("http://visit1.mozilla.org") },
{ uri: NetUtil.newURI("http://visit2.mozilla.org"),
transition: TRANSITION_TYPED }];
yield promiseAddVisits(places);
yield PlacesTestUtils.addVisits(places);
yield check_autocomplete({
search: "vis",
autofilled: "visit2.mozilla.org/",
@ -36,7 +38,7 @@ add_task(function* test_urls_order() {
add_task(function* test_ignore_prefix() {
do_print("Add urls, make sure www and http are ignored");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits(NetUtil.newURI("http://www.visit1.mozilla.org"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://www.visit1.mozilla.org"));
yield check_autocomplete({
search: "visit1",
autofilled: "visit1.mozilla.org/",
@ -48,7 +50,7 @@ add_task(function* test_ignore_prefix() {
add_task(function* test_after_host() {
do_print("Autocompleting after an existing host completes to the url");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits(NetUtil.newURI("http://www.visit3.mozilla.org"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://www.visit3.mozilla.org"));
yield check_autocomplete({
search: "visit3.mozilla.org/",
autofilled: "visit3.mozilla.org/",
@ -60,7 +62,7 @@ add_task(function* test_after_host() {
add_task(function* test_respect_www() {
do_print("Searching for www.me should yield www.me.mozilla.org/");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits(NetUtil.newURI("http://www.me.mozilla.org"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://www.me.mozilla.org"));
yield check_autocomplete({
search: "www.me",
autofilled: "www.me.mozilla.org/",
@ -73,7 +75,7 @@ add_task(function* test_bookmark_first() {
do_print("With a bookmark and history, the query result should be the bookmark");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
addBookmark({ uri: NetUtil.newURI("http://bookmark1.mozilla.org/") });
yield promiseAddVisits(NetUtil.newURI("http://bookmark1.mozilla.org/foo"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://bookmark1.mozilla.org/foo"));
yield check_autocomplete({
search: "bookmark",
autofilled: "bookmark1.mozilla.org/",
@ -87,7 +89,7 @@ add_task(function* test_full_path() {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
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") }];
yield promiseAddVisits(places);
yield PlacesTestUtils.addVisits(places);
yield check_autocomplete({
search: "smokey",
autofilled: "smokey.mozilla.org/",
@ -101,7 +103,7 @@ add_task(function* test_complete_to_slash() {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
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") }];
yield promiseAddVisits(places);
yield PlacesTestUtils.addVisits(places);
yield check_autocomplete({
search: "smokey.mozilla.org/fo",
autofilled: "smokey.mozilla.org/foo/",
@ -115,7 +117,7 @@ add_task(function* test_complete_to_slash_with_www() {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
let places = [{ uri: NetUtil.newURI("http://www.smokey.mozilla.org/foo/bar/baz?bacon=delicious") },
{ uri: NetUtil.newURI("http://www.smokey.mozilla.org/foo/bar/baz?bacon=smokey") }];
yield promiseAddVisits(places);
yield PlacesTestUtils.addVisits(places);
yield check_autocomplete({
search: "smokey.mozilla.org/fo",
autofilled: "smokey.mozilla.org/foo/",
@ -127,7 +129,7 @@ add_task(function* test_complete_to_slash_with_www() {
add_task(function* test_complete_querystring() {
do_print("Check to make sure we autocomplete after ?");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious"));
yield check_autocomplete({
search: "smokey.mozilla.org/foo?",
autofilled: "smokey.mozilla.org/foo?bacon=delicious",
@ -139,7 +141,7 @@ add_task(function* test_complete_querystring() {
add_task(function* test_complete_fragment() {
do_print("Check to make sure we autocomplete after #");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious#bar"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious#bar"));
yield check_autocomplete({
search: "smokey.mozilla.org/foo?bacon=delicious#bar",
autofilled: "smokey.mozilla.org/foo?bacon=delicious#bar",

2
toolkit/components/places/tests/unifiedcomplete/test_autocomplete_on_value_removed_479089.js
View File

@ -17,7 +17,7 @@ add_task(function* test_autocomplete_on_value_removed() {
getService(Components.interfaces.nsIAutoCompleteSimpleResultListener);
let testUri = NetUtil.newURI("http://foo.mozilla.com/");
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: testUri,
referrer: uri("http://mozilla.com/")
});

24
toolkit/components/places/tests/unifiedcomplete/test_avoid_middle_complete.js
View File

@ -3,8 +3,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
add_task(function* test_prefix_space_noautofill() {
yield promiseAddVisits({ uri: NetUtil.newURI("http://moz.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://moz.org/test/"),
transition: TRANSITION_TYPED
});
do_print("Should not try to autoFill if search string contains a space");
yield check_autocomplete({
@ -17,8 +19,10 @@ add_task(function* test_prefix_space_noautofill() {
});
add_task(function* test_trailing_space_noautofill() {
yield promiseAddVisits({ uri: NetUtil.newURI("http://moz.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://moz.org/test/"),
transition: TRANSITION_TYPED
});
do_print("Should not try to autoFill if search string contains a space");
yield check_autocomplete({
@ -154,10 +158,14 @@ add_task(function* test_searchEngine_matching_prefix_autofill() {
});
add_task(function* test_prefix_autofill() {
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield promiseAddVisits({ uri: NetUtil.newURI("http://moz.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://moz.org/test/"),
transition: TRANSITION_TYPED
});
do_print("Should not try to autoFill in-the-middle if a search is canceled immediately");
yield check_autocomplete({

2
toolkit/components/places/tests/unifiedcomplete/test_avoid_stripping_to_empty_tokens.js
View File

@ -10,7 +10,7 @@ add_task(function* test_protocol_trimming() {
title: "Test title",
transition: TRANSITION_TYPED
};
yield promiseAddVisits(visit);
yield PlacesTestUtils.addVisits(visit);
let matches = [{uri: visit.uri, title: visit.title}];
let inputs = [

66
toolkit/components/places/tests/unifiedcomplete/test_casing.js
View File

@ -4,8 +4,10 @@
add_task(function* test_casing_1() {
do_print("Searching for cased entry 1");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "MOZ",
autofilled: "MOZilla.org/",
@ -16,8 +18,10 @@ add_task(function* test_casing_1() {
add_task(function* test_casing_2() {
do_print("Searching for cased entry 2");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org/T",
autofilled: "mozilla.org/T",
@ -28,8 +32,10 @@ add_task(function* test_casing_2() {
add_task(function* test_casing_3() {
do_print("Searching for cased entry 3");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org/T",
autofilled: "mozilla.org/Test/",
@ -40,8 +46,10 @@ add_task(function* test_casing_3() {
add_task(function* test_casing_4() {
do_print("Searching for cased entry 4");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mOzilla.org/t",
autofilled: "mOzilla.org/t",
@ -52,8 +60,10 @@ add_task(function* test_casing_4() {
add_task(function* test_casing_5() {
do_print("Searching for cased entry 5");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mOzilla.org/T",
autofilled: "mOzilla.org/Test/",
@ -64,8 +74,10 @@ add_task(function* test_casing_5() {
add_task(function* test_untrimmed_casing() {
do_print("Searching for untrimmed cased entry");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "http://mOz",
autofilled: "http://mOzilla.org/",
@ -76,8 +88,10 @@ add_task(function* test_untrimmed_casing() {
add_task(function* test_untrimmed_www_casing() {
do_print("Searching for untrimmed cased entry with www");
yield promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/Test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/Test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "http://www.mOz",
autofilled: "http://www.mOzilla.org/",
@ -88,8 +102,10 @@ add_task(function* test_untrimmed_www_casing() {
add_task(function* test_untrimmed_path_casing() {
do_print("Searching for untrimmed cased entry with path");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "http://mOzilla.org/t",
autofilled: "http://mOzilla.org/t",
@ -100,8 +116,10 @@ add_task(function* test_untrimmed_path_casing() {
add_task(function* test_untrimmed_path_casing_2() {
do_print("Searching for untrimmed cased entry with path 2");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/Test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "http://mOzilla.org/T",
autofilled: "http://mOzilla.org/Test/",
@ -112,8 +130,10 @@ add_task(function* test_untrimmed_path_casing_2() {
add_task(function* test_untrimmed_path_www_casing() {
do_print("Searching for untrimmed cased entry with www and path");
yield promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/Test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/Test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "http://www.mOzilla.org/t",
autofilled: "http://www.mOzilla.org/t",
@ -124,8 +144,10 @@ add_task(function* test_untrimmed_path_www_casing() {
add_task(function* test_untrimmed_path_www_casing_2() {
do_print("Searching for untrimmed cased entry with www and path 2");
yield promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/Test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/Test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "http://www.mOzilla.org/T",
autofilled: "http://www.mOzilla.org/Test/",

36
toolkit/components/places/tests/unifiedcomplete/test_do_not_trim.js
View File

@ -7,8 +7,10 @@
add_task(function* test_not_autofill_ws_1() {
do_print("Do not autofill whitespaced entry 1");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org ",
autofilled: "mozilla.org ",
@ -19,8 +21,10 @@ add_task(function* test_not_autofill_ws_1() {
add_task(function* test_not_autofill_ws_2() {
do_print("Do not autofill whitespaced entry 2");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org/ ",
autofilled: "mozilla.org/ ",
@ -31,8 +35,10 @@ add_task(function* test_not_autofill_ws_2() {
add_task(function* test_not_autofill_ws_3() {
do_print("Do not autofill whitespaced entry 3");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org/link ",
autofilled: "mozilla.org/link ",
@ -43,8 +49,10 @@ add_task(function* test_not_autofill_ws_3() {
add_task(function* test_not_autofill_ws_4() {
do_print("Do not autofill whitespaced entry 4");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org/link/ ",
autofilled: "mozilla.org/link/ ",
@ -56,8 +64,10 @@ add_task(function* test_not_autofill_ws_4() {
add_task(function* test_not_autofill_ws_5() {
do_print("Do not autofill whitespaced entry 5");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "moz illa ",
autofilled: "moz illa ",
@ -68,8 +78,10 @@ add_task(function* test_not_autofill_ws_5() {
add_task(function* test_not_autofill_ws_6() {
do_print("Do not autofill whitespaced entry 6");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: " mozilla",
autofilled: " mozilla",

20
toolkit/components/places/tests/unifiedcomplete/test_download_embed_bookmarks.js
View File

@ -16,18 +16,14 @@ add_task(function* test_download_embed_bookmarks() {
let uri4 = NetUtil.newURI("http://download");
let uri5 = NetUtil.newURI("http://embed");
let uri6 = NetUtil.newURI("http://framed");
yield promiseAddVisits([ { uri: uri1, title: "download-bookmark",
transition: TRANSITION_DOWNLOAD },
{ uri: uri2, title: "embed-bookmark",
transition: TRANSITION_EMBED },
{ uri: uri3, title: "framed-bookmark",
transition: TRANSITION_FRAMED_LINK},
{ uri: uri4, title: "download2",
transition: TRANSITION_DOWNLOAD },
{ uri: uri5, title: "embed2",
transition: TRANSITION_EMBED },
{ uri: uri6, title: "framed2",
transition: TRANSITION_FRAMED_LINK } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "download-bookmark", transition: TRANSITION_DOWNLOAD },
{ uri: uri2, title: "embed-bookmark", transition: TRANSITION_EMBED },
{ uri: uri3, title: "framed-bookmark", transition: TRANSITION_FRAMED_LINK},
{ uri: uri4, title: "download2", transition: TRANSITION_DOWNLOAD },
{ uri: uri5, title: "embed2", transition: TRANSITION_EMBED },
{ uri: uri6, title: "framed2", transition: TRANSITION_FRAMED_LINK }
]);
addBookmark({ uri: uri1,
title: "download-bookmark" });
addBookmark({ uri: uri2,

9
toolkit/components/places/tests/unifiedcomplete/test_dupe_urls.js
View File

@ -5,9 +5,12 @@
add_task(function* test_dupe_urls() {
do_print("Searching for urls with dupes should only show one");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.org/?") });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/"),
transition: TRANSITION_TYPED
}, {
uri: NetUtil.newURI("http://mozilla.org/?")
});
yield check_autocomplete({
search: "moz",
autofilled: "mozilla.org/",

17
toolkit/components/places/tests/unifiedcomplete/test_empty_search.js
View File

@ -16,15 +16,14 @@ add_task(function* test_javascript_match() {
let uri6 = NetUtil.newURI("http://t.foo/5");
let uri7 = NetUtil.newURI("http://t.foo/6");
yield promiseAddVisits([ { uri: uri1, title: "title" },
{ uri: uri2, title: "title" },
{ uri: uri3, title: "title",
transition: TRANSITION_TYPED},
{ uri: uri4, title: "title",
transition: TRANSITION_TYPED },
{ uri: uri6, title: "title",
transition: TRANSITION_TYPED },
{ uri: uri7, title: "title" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "title" },
{ uri: uri2, title: "title" },
{ uri: uri3, title: "title", transition: TRANSITION_TYPED},
{ uri: uri4, title: "title", transition: TRANSITION_TYPED },
{ uri: uri6, title: "title", transition: TRANSITION_TYPED },
{ uri: uri7, title: "title" }
]);
addBookmark({ uri: uri2,
title: "title" });

2
toolkit/components/places/tests/unifiedcomplete/test_enabled.js
View File

@ -9,7 +9,7 @@
add_task(function* test_enabled() {
let uri = NetUtil.newURI("http://url/0");
yield promiseAddVisits([ { uri: uri, title: "title" } ]);
yield PlacesTestUtils.addVisits([ { uri: uri, title: "title" } ]);
do_print("plain search");
yield check_autocomplete({

6
toolkit/components/places/tests/unifiedcomplete/test_escape_self.js
View File

@ -10,8 +10,10 @@
add_task(function* test_escape() {
let uri1 = NetUtil.newURI("http://unescapeduri/");
let uri2 = NetUtil.newURI("http://escapeduri/%40/");
yield promiseAddVisits([ { uri: uri1, title: "title" },
{ uri: uri2, title: "title" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "title" },
{ uri: uri2, title: "title" }
]);
do_print("Unescaped location matches itself");
yield check_autocomplete({

6
toolkit/components/places/tests/unifiedcomplete/test_ignore_protocol.js
View File

@ -9,8 +9,10 @@
add_task(function* test_escape() {
let uri1 = NetUtil.newURI("http://site/");
let uri2 = NetUtil.newURI("http://happytimes/");
yield promiseAddVisits([ { uri: uri1, title: "title" },
{ uri: uri2, title: "title" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "title" },
{ uri: uri2, title: "title" }
]);
do_print("Searching for h matches site and not http://");
yield check_autocomplete({

8
toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js
View File

@ -15,8 +15,10 @@
add_task(function* test_keyword_searc() {
let uri1 = NetUtil.newURI("http://abc/?search=%s");
let uri2 = NetUtil.newURI("http://abc/?search=ThisPageIsInHistory");
yield promiseAddVisits([ { uri: uri1, title: "Generic page title" },
{ uri: uri2, title: "Generic page title" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "Generic page title" },
{ uri: uri2, title: "Generic page title" }
]);
addBookmark({ uri: uri1, title: "Keyword title", keyword: "key"});
do_print("Plain keyword query");
@ -63,7 +65,7 @@ add_task(function* test_keyword_searc() {
// This adds a second keyword so anything after this will match 2 keywords
let uri3 = NetUtil.newURI("http://xyz/?foo=%s");
yield promiseAddVisits([ { uri: uri3, title: "Generic page title" } ]);
yield PlacesTestUtils.addVisits([ { uri: uri3, title: "Generic page title" } ]);
addBookmark({ uri: uri3, title: "Keyword title", keyword: "key", style: ["keyword"] });
do_print("Two keywords matched");

8
toolkit/components/places/tests/unifiedcomplete/test_keyword_search_actions.js
View File

@ -15,8 +15,10 @@
add_task(function* test_keyword_search() {
let uri1 = NetUtil.newURI("http://abc/?search=%s");
let uri2 = NetUtil.newURI("http://abc/?search=ThisPageIsInHistory");
yield promiseAddVisits([ { uri: uri1, title: "Generic page title" },
{ uri: uri2, title: "Generic page title" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "Generic page title" },
{ uri: uri2, title: "Generic page title" }
]);
addBookmark({ uri: uri1, title: "Keyword title", keyword: "key"});
do_print("Plain keyword query");
@ -70,7 +72,7 @@ add_task(function* test_keyword_search() {
// This adds a second keyword so anything after this will match 2 keywords
let uri3 = NetUtil.newURI("http://xyz/?foo=%s");
yield promiseAddVisits([ { uri: uri3, title: "Generic page title" } ]);
yield PlacesTestUtils.addVisits([ { uri: uri3, title: "Generic page title" } ]);
addBookmark({ uri: uri3, title: "Keyword title", keyword: "key"});
do_print("Two keywords matched");

30
toolkit/components/places/tests/unifiedcomplete/test_keywords.js
View File

@ -4,8 +4,10 @@
add_task(function* test_non_keyword() {
do_print("Searching for non-keyworded entry should autoFill it");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
addBookmark({ uri: NetUtil.newURI("http://mozilla.org/test/") });
yield check_autocomplete({
search: "moz",
@ -17,8 +19,10 @@ add_task(function* test_non_keyword() {
add_task(function* test_keyword() {
do_print("Searching for keyworded entry should not autoFill it");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
addBookmark({ uri: NetUtil.newURI("http://mozilla.org/test/"), keyword: "moz" });
yield check_autocomplete({
search: "moz",
@ -30,8 +34,10 @@ add_task(function* test_keyword() {
add_task(function* test_more_than_keyword() {
do_print("Searching for more than keyworded entry should autoFill it");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
addBookmark({ uri: NetUtil.newURI("http://mozilla.org/test/"), keyword: "moz" });
yield check_autocomplete({
search: "mozi",
@ -43,8 +49,10 @@ add_task(function* test_more_than_keyword() {
add_task(function* test_less_than_keyword() {
do_print("Searching for less than keyworded entry should autoFill it");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
addBookmark({ uri: NetUtil.newURI("http://mozilla.org/test/"), keyword: "moz" });
yield check_autocomplete({
search: "mo",
@ -56,8 +64,10 @@ add_task(function* test_less_than_keyword() {
add_task(function* test_keyword_casing() {
do_print("Searching for keyworded entry is case-insensitive");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
addBookmark({ uri: NetUtil.newURI("http://mozilla.org/test/"), keyword: "moz" });
yield check_autocomplete({
search: "MoZ",

6
toolkit/components/places/tests/unifiedcomplete/test_match_beginning.js
View File

@ -12,8 +12,10 @@ add_task(function* test_match_beginning() {
let uri1 = NetUtil.newURI("http://x.com/y");
let uri2 = NetUtil.newURI("https://y.com/x");
yield promiseAddVisits([ { uri: uri1, title: "a b" },
{ uri: uri2, title: "b a" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "a b" },
{ uri: uri2, title: "b a" }
]);
do_print("Match at the beginning of titles");
Services.prefs.setIntPref("browser.urlbar.matchBehavior", 3);

10
toolkit/components/places/tests/unifiedcomplete/test_multi_word_search.js
View File

@ -17,10 +17,12 @@ add_task(function* test_match_beginning() {
let uri2 = NetUtil.newURI("http://d.e.f/g-h_i/h/t/p");
let uri3 = NetUtil.newURI("http://g.h.i/j-k_l/h/t/p");
let uri4 = NetUtil.newURI("http://j.k.l/m-n_o/h/t/p");
yield promiseAddVisits([ { uri: uri1, title: "f(o)o b<a>r" },
{ uri: uri2, title: "b(a)r b<a>z" },
{ uri: uri3, title: "f(o)o b<a>r" },
{ uri: uri4, title: "f(o)o b<a>r" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "f(o)o b<a>r" },
{ uri: uri2, title: "b(a)r b<a>z" },
{ uri: uri3, title: "f(o)o b<a>r" },
{ uri: uri4, title: "f(o)o b<a>r" }
]);
addBookmark({ uri: uri3, title: "f(o)o b<a>r" });
addBookmark({ uri: uri4, title: "b(a)r b<a>z" });

39
toolkit/components/places/tests/unifiedcomplete/test_queryurl.js
View File

@ -4,10 +4,13 @@
add_task(function* test_no_slash() {
do_print("Searching for host match without slash should match host");
yield promiseAddVisits({ uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED
}, {
uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "file",
autofilled: "file.org/",
@ -18,10 +21,13 @@ add_task(function* test_no_slash() {
add_task(function* test_w_slash() {
do_print("Searching match with slash at the end should do nothing");
yield promiseAddVisits({ uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED
}, {
uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "file.org/",
autofilled: "file.org/",
@ -32,10 +38,13 @@ add_task(function* test_w_slash() {
add_task(function* test_middle() {
do_print("Searching match with slash in the middle should match url");
yield promiseAddVisits({ uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://file.org/test/"),
transition: TRANSITION_TYPED
}, {
uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "file.org/t",
autofilled: "file.org/test/",
@ -46,8 +55,10 @@ add_task(function* test_middle() {
add_task(function* test_nonhost() {
do_print("Searching for non-host match without slash should not match url");
yield promiseAddVisits({ uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("file:///c:/test.html"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "file",
autofilled: "file",

4
toolkit/components/places/tests/unifiedcomplete/test_searchEngine_host.js
View File

@ -50,7 +50,7 @@ add_task(function* test_searchEngine_autoFill() {
for (let i = 0; i < 100; ++i) {
visits.push({ uri , title: "Terms - SearchEngine Search" });
}
yield promiseAddVisits(visits);
yield PlacesTestUtils.addVisits(visits);
addBookmark({ uri: uri, title: "Example bookmark" });
yield PlacesTestUtils.promiseAsyncUpdates();
ok(frecencyForUrl(uri) > 10000, "Added URI should have expected high frecency");
@ -72,7 +72,7 @@ add_task(function* test_searchEngine_noautoFill() {
equal(engine.searchForm, "http://example.com/?search");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits(NetUtil.newURI("http://example.com/my/"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://example.com/my/"));
do_print("Check search domain is not autoFilled if it matches a visited domain");
yield check_autocomplete({

2
toolkit/components/places/tests/unifiedcomplete/test_searchEngine_restyle.js
View File

@ -11,7 +11,7 @@ add_task(function* test_searchEngine() {
let uri1 = NetUtil.newURI("http://s.example.com/search?q=Terms&client=1");
let uri2 = NetUtil.newURI("http://s.example.com/search?q=Terms&client=2");
yield promiseAddVisits({ uri: uri1, title: "Terms - SearchEngine Search" });
yield PlacesTestUtils.addVisits({ uri: uri1, title: "Terms - SearchEngine Search" });
addBookmark({ uri: uri2, title: "Terms - SearchEngine Search" });
do_print("Past search terms should be styled, unless bookmarked");

14
toolkit/components/places/tests/unifiedcomplete/test_special_search.js
View File

@ -29,12 +29,14 @@ add_task(function* test_special_searches() {
let uri10 = NetUtil.newURI("http://url/tag/2");
let uri11 = NetUtil.newURI("http://foo.bar/tag");
let uri12 = NetUtil.newURI("http://foo.bar/tag/2");
yield promiseAddVisits([ { uri: uri1, title: "title", transition: TRANSITION_TYPED },
{ uri: uri2, title: "foo.bar" },
{ uri: uri3, title: "title" },
{ uri: uri4, title: "foo.bar", transition: TRANSITION_TYPED },
{ uri: uri6, title: "foo.bar" },
{ uri: uri11, title: "title", transition: TRANSITION_TYPED } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "title", transition: TRANSITION_TYPED },
{ uri: uri2, title: "foo.bar" },
{ uri: uri3, title: "title" },
{ uri: uri4, title: "foo.bar", transition: TRANSITION_TYPED },
{ uri: uri6, title: "foo.bar" },
{ uri: uri11, title: "title", transition: TRANSITION_TYPED }
]);
addBookmark( { uri: uri5, title: "title" } );
addBookmark( { uri: uri6, title: "foo.bar" } );
addBookmark( { uri: uri7, title: "title" } );

18
toolkit/components/places/tests/unifiedcomplete/test_swap_protocol.js
View File

@ -20,14 +20,16 @@ add_task(function* test_swap_protocol() {
let uri6 = NetUtil.newURI("https://site/");
let uri7 = NetUtil.newURI("http://woohoo/");
let uri8 = NetUtil.newURI("http://wwwwwwacko/");
yield promiseAddVisits([ { uri: uri1, title: "title" },
{ uri: uri2, title: "title" },
{ uri: uri3, title: "title" },
{ uri: uri4, title: "title" },
{ uri: uri5, title: "title" },
{ uri: uri6, title: "title" },
{ uri: uri7, title: "title" },
{ uri: uri8, title: "title" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "title" },
{ uri: uri2, title: "title" },
{ uri: uri3, title: "title" },
{ uri: uri4, title: "title" },
{ uri: uri5, title: "title" },
{ uri: uri6, title: "title" },
{ uri: uri7, title: "title" },
{ uri: uri8, title: "title" }
]);
let allMatches = [
{ uri: uri1, title: "title" },

6
toolkit/components/places/tests/unifiedcomplete/test_tabmatches.js
View File

@ -16,8 +16,10 @@ add_task(function* test_tab_matches() {
let uri2 = NetUtil.newURI("http://xyz.net/");
let uri3 = NetUtil.newURI("about:mozilla");
let uri4 = NetUtil.newURI("data:text/html,test");
yield promiseAddVisits([ { uri: uri1, title: "ABC rocks" },
{ uri: uri2, title: "xyz.net - we're better than ABC" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "ABC rocks" },
{ uri: uri2, title: "xyz.net - we're better than ABC" }
]);
addOpenPages(uri1, 1);
// Pages that cannot be registered in history.
addOpenPages(uri3, 1);

151
toolkit/components/places/tests/unifiedcomplete/test_trimming.js
View File

@ -4,8 +4,10 @@
add_task(function* test_untrimmed_secure_www() {
do_print("Searching for untrimmed https://www entry");
yield promiseAddVisits({ uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -16,8 +18,10 @@ add_task(function* test_untrimmed_secure_www() {
add_task(function* test_untrimmed_secure_www_path() {
do_print("Searching for untrimmed https://www entry with path");
yield promiseAddVisits({ uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org/t",
autofilled: "mozilla.org/test/",
@ -28,8 +32,10 @@ add_task(function* test_untrimmed_secure_www_path() {
add_task(function* test_untrimmed_secure() {
do_print("Searching for untrimmed https:// entry");
yield promiseAddVisits({ uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -40,8 +46,10 @@ add_task(function* test_untrimmed_secure() {
add_task(function* test_untrimmed_secure_path() {
do_print("Searching for untrimmed https:// entry with path");
yield promiseAddVisits({ uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org/t",
autofilled: "mozilla.org/test/",
@ -52,8 +60,10 @@ add_task(function* test_untrimmed_secure_path() {
add_task(function* test_untrimmed_www() {
do_print("Searching for untrimmed http://www entry");
yield promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -64,8 +74,10 @@ add_task(function* test_untrimmed_www() {
add_task(function* test_untrimmed_www_path() {
do_print("Searching for untrimmed http://www entry with path");
yield promiseAddVisits({ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org/t",
autofilled: "mozilla.org/test/",
@ -76,8 +88,10 @@ add_task(function* test_untrimmed_www_path() {
add_task(function* test_untrimmed_ftp() {
do_print("Searching for untrimmed ftp:// entry");
yield promiseAddVisits({ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -88,8 +102,10 @@ add_task(function* test_untrimmed_ftp() {
add_task(function* test_untrimmed_ftp_path() {
do_print("Searching for untrimmed ftp:// entry with path");
yield promiseAddVisits({ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "mozilla.org/t",
autofilled: "mozilla.org/test/",
@ -100,16 +116,13 @@ add_task(function* test_untrimmed_ftp_path() {
add_task(function* test_priority_1() {
do_print("Ensuring correct priority 1");
yield promiseAddVisits([{ uri: NetUtil.newURI("https://www.mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED }]);
yield PlacesTestUtils.addVisits([
{ uri: NetUtil.newURI("https://www.mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("https://mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("ftp://mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://www.mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.org/test/"), transition: TRANSITION_TYPED }
]);
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -120,14 +133,12 @@ add_task(function* test_priority_1() {
add_task(function* test_periority_2() {
do_print( "Ensuring correct priority 2");
yield promiseAddVisits([{ uri: NetUtil.newURI("https://mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED }]);
yield PlacesTestUtils.addVisits([
{ uri: NetUtil.newURI("https://mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("ftp://mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://www.mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.org/test/"), transition: TRANSITION_TYPED }
]);
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -138,12 +149,11 @@ add_task(function* test_periority_2() {
add_task(function* test_periority_3() {
do_print("Ensuring correct priority 3");
yield promiseAddVisits([{ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED }]);
yield PlacesTestUtils.addVisits([
{ uri: NetUtil.newURI("ftp://mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://www.mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.org/test/"), transition: TRANSITION_TYPED }
]);
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -154,10 +164,10 @@ add_task(function* test_periority_3() {
add_task(function* test_periority_4() {
do_print("Ensuring correct priority 4");
yield promiseAddVisits([{ uri: NetUtil.newURI("http://www.mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.org/test/"),
transition: TRANSITION_TYPED }]);
yield PlacesTestUtils.addVisits([
{ uri: NetUtil.newURI("http://www.mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.org/test/"), transition: TRANSITION_TYPED }
]);
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -168,10 +178,10 @@ add_task(function* test_periority_4() {
add_task(function* test_priority_5() {
do_print("Ensuring correct priority 5");
yield promiseAddVisits([{ uri: NetUtil.newURI("ftp://mozilla.org/test/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("ftp://www.mozilla.org/test/"),
transition: TRANSITION_TYPED }]);
yield PlacesTestUtils.addVisits([
{ uri: NetUtil.newURI("ftp://mozilla.org/test/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("ftp://www.mozilla.org/test/"), transition: TRANSITION_TYPED }
]);
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -182,10 +192,10 @@ add_task(function* test_priority_5() {
add_task(function* test_priority_6() {
do_print("Ensuring correct priority 6");
yield promiseAddVisits([{ uri: NetUtil.newURI("http://www.mozilla.org/test1/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://www.mozilla.org/test2/"),
transition: TRANSITION_TYPED }]);
yield PlacesTestUtils.addVisits([
{ uri: NetUtil.newURI("http://www.mozilla.org/test1/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://www.mozilla.org/test2/"), transition: TRANSITION_TYPED }
]);
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.org/",
@ -198,12 +208,11 @@ add_task(function* test_longer_domain() {
do_print("Ensuring longer domain can't match");
// The .co should be preferred, but should not get the https from the .com.
// The .co domain must be added later to activate the trigger bug.
yield promiseAddVisits([{ uri: NetUtil.newURI("https://mozilla.com/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.co/"),
transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.co/"),
transition: TRANSITION_TYPED }]);
yield PlacesTestUtils.addVisits([
{ uri: NetUtil.newURI("https://mozilla.com/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.co/"), transition: TRANSITION_TYPED },
{ uri: NetUtil.newURI("http://mozilla.co/"), transition: TRANSITION_TYPED }
]);
yield check_autocomplete({
search: "mo",
autofilled: "mozilla.co/",
@ -215,8 +224,10 @@ add_task(function* test_longer_domain() {
add_task(function* test_escaped_chars() {
do_print("Searching for URL with characters that are normally escaped");
yield promiseAddVisits({ uri: NetUtil.newURI("https://www.mozilla.org/啊-test"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("https://www.mozilla.org/啊-test"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "https://www.mozilla.org/啊-test",
autofilled: "https://www.mozilla.org/啊-test",
@ -227,8 +238,10 @@ add_task(function* test_escaped_chars() {
add_task(function* test_unsecure_secure() {
do_print("Don't return unsecure URL when searching for secure ones");
yield promiseAddVisits({ uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "https://test.moz.org/t",
autofilled: "https://test.moz.org/test/",
@ -239,8 +252,10 @@ add_task(function* test_unsecure_secure() {
add_task(function* test_unsecure_secure_domain() {
do_print("Don't return unsecure domain when searching for secure ones");
yield promiseAddVisits({ uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://test.moz.org/test/"),
transition: TRANSITION_TYPED
});
yield check_autocomplete({
search: "https://test.moz",
autofilled: "https://test.moz.org/",
@ -252,7 +267,7 @@ add_task(function* test_unsecure_secure_domain() {
add_task(function* test_untyped_www() {
do_print("Untyped is not accounted for www");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits({ uri: NetUtil.newURI("http://www.moz.org/test/") });
yield PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://www.moz.org/test/") });
yield check_autocomplete({
search: "mo",
autofilled: "moz.org/",
@ -264,7 +279,7 @@ add_task(function* test_untyped_www() {
add_task(function* test_untyped_ftp() {
do_print("Untyped is not accounted for ftp");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits({ uri: NetUtil.newURI("ftp://moz.org/test/") });
yield PlacesTestUtils.addVisits({ uri: NetUtil.newURI("ftp://moz.org/test/") });
yield check_autocomplete({
search: "mo",
autofilled: "moz.org/",
@ -276,7 +291,7 @@ add_task(function* test_untyped_ftp() {
add_task(function* test_untyped_secure() {
do_print("Untyped is not accounted for https");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits({ uri: NetUtil.newURI("https://moz.org/test/") });
yield PlacesTestUtils.addVisits({ uri: NetUtil.newURI("https://moz.org/test/") });
yield check_autocomplete({
search: "mo",
autofilled: "moz.org/",
@ -288,7 +303,7 @@ add_task(function* test_untyped_secure() {
add_task(function* test_untyped_secure_www() {
do_print("Untyped is not accounted for https://www");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits({ uri: NetUtil.newURI("https://www.moz.org/test/") });
yield PlacesTestUtils.addVisits({ uri: NetUtil.newURI("https://www.moz.org/test/") });
yield check_autocomplete({
search: "mo",
autofilled: "moz.org/",

12
toolkit/components/places/tests/unifiedcomplete/test_typed.js
View File

@ -8,7 +8,7 @@
add_task(function* test_domain() {
do_print("Searching for domain should autoFill it");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://mozilla.org/link/"));
yield check_autocomplete({
search: "moz",
autofilled: "mozilla.org/",
@ -20,7 +20,7 @@ add_task(function* test_domain() {
add_task(function* test_url() {
do_print("Searching for url should autoFill it");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://mozilla.org/link/"));
yield check_autocomplete({
search: "mozilla.org/li",
autofilled: "mozilla.org/link/",
@ -33,7 +33,7 @@ add_task(function* test_url() {
add_task(function* test_untyped_domain() {
do_print("Searching for non-typed domain should not autoFill it");
yield promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://mozilla.org/link/"));
yield check_autocomplete({
search: "moz",
autofilled: "moz",
@ -44,7 +44,7 @@ add_task(function* test_untyped_domain() {
add_task(function* test_typed_domain() {
do_print("Searching for typed domain should autoFill it");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/typed/"),
yield PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/typed/"),
transition: TRANSITION_TYPED });
yield check_autocomplete({
search: "moz",
@ -56,7 +56,7 @@ add_task(function* test_typed_domain() {
add_task(function* test_untyped_url() {
do_print("Searching for non-typed url should not autoFill it");
yield promiseAddVisits(NetUtil.newURI("http://mozilla.org/link/"));
yield PlacesTestUtils.addVisits(NetUtil.newURI("http://mozilla.org/link/"));
yield check_autocomplete({
search: "mozilla.org/li",
autofilled: "mozilla.org/li",
@ -67,7 +67,7 @@ add_task(function* test_untyped_url() {
add_task(function* test_typed_url() {
do_print("Searching for typed url should autoFill it");
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
yield PlacesTestUtils.addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
yield check_autocomplete({
search: "mozilla.org/li",

4
toolkit/components/places/tests/unifiedcomplete/test_visiturl.js
View File

@ -27,7 +27,7 @@ add_task(function*() {
// This is distinct because of how we predict being able to url autofill via
// host lookups.
do_print("visit url, host matching visited host but not visited url");
yield promiseAddVisits([
yield PlacesTestUtils.addVisits([
{ uri: NetUtil.newURI("http://mozilla.org/wine/"), title: "Mozilla Wine", transition: TRANSITION_TYPED },
]);
yield check_autocomplete({
@ -42,7 +42,7 @@ add_task(function*() {
"http://s.example.com/search");
let engine = Services.search.getEngineByName("MozSearch");
Services.search.currentEngine = engine;
yield promiseAddVisits([
yield PlacesTestUtils.addVisits([
{ uri: NetUtil.newURI("http://mozilla/bourbon/"), title: "Mozilla Bourbon", transition: TRANSITION_TYPED },
]);
yield check_autocomplete({

22
toolkit/components/places/tests/unifiedcomplete/test_word_boundary_search.js
View File

@ -31,16 +31,18 @@ add_task(function* test_escape() {
let uri9 = NetUtil.newURI("http://ideograph/");
let uri10 = NetUtil.newURI("http://camel/pleaseMatchMe/");
yield promiseAddVisits([ { uri: uri1, title: "title1" },
{ uri: uri2, title: "title1" },
{ uri: uri3, title: "matchme2" },
{ uri: uri4, title: "dontmatchme3" },
{ uri: uri5, title: "title1" },
{ uri: uri6, title: "title1" },
{ uri: uri7, title: "!@#$%^&*()_+{}|:<>?word" },
{ uri: uri8, title: katakana.join("") },
{ uri: uri9, title: ideograph.join("") },
{ uri: uri10, title: "title1" } ]);
yield PlacesTestUtils.addVisits([
{ uri: uri1, title: "title1" },
{ uri: uri2, title: "title1" },
{ uri: uri3, title: "matchme2" },
{ uri: uri4, title: "dontmatchme3" },
{ uri: uri5, title: "title1" },
{ uri: uri6, title: "title1" },
{ uri: uri7, title: "!@#$%^&*()_+{}|:<>?word" },
{ uri: uri8, title: katakana.join("") },
{ uri: uri9, title: ideograph.join("") },
{ uri: uri10, title: "title1" }
]);
addBookmark( { uri: uri5, title: "title1", tags: [ "matchme2" ] } );
addBookmark( { uri: uri6, title: "title1", tags: [ "dontmatchme3" ] } );

12
toolkit/components/places/tests/unifiedcomplete/test_zero_frecency.js
View File

@ -7,8 +7,10 @@
add_task(function* test_zzero_frec_domain() {
do_print("Searching for zero frecency domain should not autoFill it");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/framed_link/"),
transition: TRANSITION_FRAMED_LINK });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/framed_link/"),
transition: TRANSITION_FRAMED_LINK
});
yield check_autocomplete({
search: "moz",
autofilled: "moz",
@ -20,8 +22,10 @@ add_task(function* test_zzero_frec_domain() {
add_task(function* test_zzero_frec_url() {
do_print("Searching for zero frecency url should not autoFill it");
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
yield promiseAddVisits({ uri: NetUtil.newURI("http://mozilla.org/framed_link/"),
transition: TRANSITION_FRAMED_LINK });
yield PlacesTestUtils.addVisits({
uri: NetUtil.newURI("http://mozilla.org/framed_link/"),
transition: TRANSITION_FRAMED_LINK
});
yield check_autocomplete({
search: "mozilla.org/f",
autofilled: "mozilla.org/f",

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

@ -89,7 +89,7 @@ function task_initializeBucket(bucket) {
}
else {
matchTitle = searchTerm + "UnvisitedTyped";
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: calculatedURI,
title: matchTitle,
transition: visitType,
@ -126,7 +126,7 @@ function task_initializeBucket(bucket) {
}
else
matchTitle = calculatedURI.spec.substr(calculatedURI.spec.lastIndexOf("/")+1);
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: calculatedURI,
transition: visitType,
visitDate: dateInPeriod
@ -135,7 +135,7 @@ function task_initializeBucket(bucket) {
if (calculatedURI && frecency) {
results.push([calculatedURI, frecency, matchTitle]);
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: calculatedURI,
title: matchTitle,
transition: visitType,

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

@ -18,8 +18,8 @@ function run_test()
add_task(function test_execute()
{
// add pages to history
yield promiseAddVisits(TEST_URI);
yield promiseAddVisits(TEST_BOOKMARKED_URI);
yield PlacesTestUtils.addVisits(TEST_URI);
yield PlacesTestUtils.addVisits(TEST_BOOKMARKED_URI);
// create bookmarks on TEST_BOOKMARKED_URI
var bm1 = PlacesUtils.bookmarks.insertBookmark(

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

@ -20,7 +20,7 @@ add_task(function test_execute()
let testURI = uri(site);
let testImageURI = uri(site + "blank.gif");
let when = now + (i * TOTAL_SITES);
yield promiseAddVisits([
yield PlacesTestUtils.addVisits([
{ uri: testURI, visitDate: when, transition: TRANSITION_TYPED },
{ uri: testImageURI, visitDate: ++when, transition: TRANSITION_EMBED },
{ uri: testImageURI, visitDate: ++when, transition: TRANSITION_FRAMED_LINK },

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

@ -26,7 +26,7 @@ add_task(function test_execute()
transition: TRANSITION_FRAMED_LINK });
}
}
yield promiseAddVisits(places);
yield PlacesTestUtils.addVisits(places);
// test our optimized query for the "Most Visited" item
// in the "Smart Bookmarks" folder

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

@ -52,7 +52,7 @@ add_task(function changeuri_visited_bookmark()
do_print("Bookmarked => frecency of URI should be != 0");
do_check_neq(frecencyForUrl(TEST_URI), 0);
yield promiseAddVisits(TEST_URI);
yield PlacesTestUtils.addVisits(TEST_URI);
yield PlacesTestUtils.promiseAsyncUpdates();

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

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

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

@ -38,6 +38,6 @@ add_task(function test_execute()
{
const SEARCH_TERM = "ユニコード";
const TEST_URL = "http://example.com/" + SEARCH_TERM + "/";
yield promiseAddVisits(uri(TEST_URL));
yield PlacesTestUtils.addVisits(uri(TEST_URL));
do_check_true(search_has_result(SEARCH_TERM));
});

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

@ -40,13 +40,13 @@ add_task(function test_execute()
let site = "http://www.test-" + i + ".com/";
let testURI = uri(site);
let when = Date.now() * 1000 + (i * TOTAL_SITES);
yield promiseAddVisits({ uri: testURI, visitDate: when });
yield PlacesTestUtils.addVisits({ uri: testURI, visitDate: when });
}
for (var i = 0; i < TOTAL_SITES; i++) {
let site = "http://www.test.com/" + i + "/";
let testURI = uri(site);
let when = Date.now() * 1000 + (i * TOTAL_SITES);
yield promiseAddVisits({ uri: testURI, visitDate: when });
yield PlacesTestUtils.addVisits({ uri: testURI, visitDate: when });
}
// set a page annotation on one of the urls that will be removed

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

@ -15,7 +15,7 @@ add_task(function test_execute()
try
{
yield promiseAddVisits(testURI);
yield PlacesTestUtils.addVisits(testURI);
do_throw("Should have generated an exception.");
} catch (ex if ex && ex.result == Cr.NS_ERROR_ILLEGAL_VALUE) {
// Adding wyciwyg URIs should raise NS_ERROR_ILLEGAL_VALUE.

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

@ -22,7 +22,7 @@ add_task(function test_execute()
"http://www.test-framed.com/"];
// add visits, one for each transition type
yield promiseAddVisits([
yield PlacesTestUtils.addVisits([
{ uri: uri("http://www.test-link.com/"),
transition: TRANSITION_LINK },
{ uri: uri("http://www.test-typed.com/"),

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

@ -22,7 +22,7 @@ add_task(function test_execute()
// add a visit
var testURI = uri("http://test");
yield promiseAddVisits(testURI);
yield PlacesTestUtils.addVisits(testURI);
// query for the visit
var options = histsvc.getNewQueryOptions();

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

@ -49,7 +49,7 @@ add_task(function test_execute()
{
// add visits, one for each transition type
for (let [, transition] in Iterator(transitions)) {
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: uri("http://" + transition + ".mozilla.org/"),
transition: transition
});

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

@ -38,7 +38,7 @@ add_task(function test_initialize()
// Add visits.
for ([pageIndex, page] in Iterator(pages)) {
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: uri(page),
visitDate: noon - (pages.length - pageIndex) * 1000
});

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

@ -28,7 +28,7 @@ add_task(function test_execute()
function task_test_url(aURL) {
print("Testing url: " + aURL.u);
yield promiseAddVisits(uri(aURL.u));
yield PlacesTestUtils.addVisits(uri(aURL.u));
let query = hs.getNewQuery();
query.searchTerms = aURL.s;
let options = hs.getNewQueryOptions();

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

@ -87,7 +87,7 @@ function task_setCountRank(aURI, aCount, aRank, aSearch, aBookmark)
for (let i = 0; i < aCount; i++) {
visits.push({ uri: aURI, visitDate: d1, transition: TRANSITION_TYPED });
}
yield promiseAddVisits(visits);
yield PlacesTestUtils.addVisits(visits);
// Make a nsIAutoCompleteController and friends for instrumentation feedback.
let thing = {

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

@ -103,7 +103,7 @@ add_task(function test_execute()
// test getPagesWithAnnotation
var uri2 = uri("http://www.tests.tld");
yield promiseAddVisits(uri2);
yield PlacesTestUtils.addVisits(uri2);
annosvc.setPageAnnotation(uri2, testAnnoName, testAnnoVal, 0, 0);
var pages = annosvc.getPagesWithAnnotation(testAnnoName);
do_check_eq(pages.length, 2);
@ -155,7 +155,7 @@ add_task(function test_execute()
// copy annotations to another uri
var newURI = uri("http://mozilla.org");
yield promiseAddVisits(newURI);
yield PlacesTestUtils.addVisits(newURI);
annosvc.setPageAnnotation(testURI, "oldAnno", "new", 0, 0);
annosvc.setPageAnnotation(newURI, "oldAnno", "old", 0, 0);
var annoNames = annosvc.getPageAnnotationNames(newURI);

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";
promiseAddVisits({ uri: uri, title: title }).then(function () {
PlacesTestUtils.addVisits({ uri: uri, title: title }).then(function () {
let options = PlacesUtils.history.getNewQueryOptions();
options.sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING;
let query = PlacesUtils.history.getNewQuery();

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

@ -26,7 +26,7 @@ add_task(function test_execute()
);
// Add also a simple visit.
yield promiseAddVisits(uri(("http://3.moz.org/")));
yield PlacesTestUtils.addVisits(uri(("http://3.moz.org/")));
// Query containing a broken folder shortcuts among results.
let query = PlacesUtils.history.getNewQuery();

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

@ -8,7 +8,7 @@ const TEST_URI = NetUtil.newURI("http://mozilla.com/");
const TEST_SUBDOMAIN_URI = NetUtil.newURI("http://foobar.mozilla.com/");
add_task(function* test_addPage() {
yield promiseAddVisits(TEST_URI);
yield PlacesTestUtils.addVisits(TEST_URI);
do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
});
@ -23,7 +23,7 @@ add_task(function* test_removePages() {
pages.push(NetUtil.newURI(TEST_URI.spec + i));
}
yield promiseAddVisits(pages.map(function (uri) ({ uri: uri })));
yield PlacesTestUtils.addVisits(pages.map(function (uri) ({ uri: uri })));
// Bookmarked item should not be removed from moz_places.
const ANNO_INDEX = 1;
const ANNO_NAME = "testAnno";
@ -69,7 +69,7 @@ add_task(function* test_removePagesByTimeframe() {
});
}
yield promiseAddVisits(visits);
yield PlacesTestUtils.addVisits(visits);
// Delete all pages except the first and the last.
PlacesUtils.bhistory.removePagesByTimeframe(startDate + 1, startDate + 8);
@ -86,13 +86,13 @@ add_task(function* test_removePagesByTimeframe() {
});
add_task(function* test_removePagesFromHost() {
yield promiseAddVisits(TEST_URI);
yield PlacesTestUtils.addVisits(TEST_URI);
PlacesUtils.bhistory.removePagesFromHost("mozilla.com", true);
do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
});
add_task(function* test_removePagesFromHost_keepSubdomains() {
yield promiseAddVisits([{ uri: TEST_URI }, { uri: TEST_SUBDOMAIN_URI }]);
yield PlacesTestUtils.addVisits([{ uri: TEST_URI }, { uri: TEST_SUBDOMAIN_URI }]);
PlacesUtils.bhistory.removePagesFromHost("mozilla.com", false);
do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
});
@ -104,7 +104,7 @@ add_task(function* test_history_clear() {
add_task(function* test_getObservers() {
// Ensure that getObservers() invalidates the hasHistoryEntries cache.
yield promiseAddVisits(TEST_URI);
yield PlacesTestUtils.addVisits(TEST_URI);
do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
// This is just for testing purposes, never do it.
return new Promise((resolve, reject) => {

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

@ -101,8 +101,10 @@ add_test(function test_dh_addRemoveDownload()
add_test(function test_dh_addMultiRemoveDownload()
{
promiseAddVisits({ uri: DOWNLOAD_URI,
transition: TRANSITION_TYPED }).then(function () {
PlacesTestUtils.addVisits({
uri: DOWNLOAD_URI,
transition: TRANSITION_TYPED
}).then(function () {
waitForOnVisit(function DHAD_onVisit(aURI) {
do_check_true(aURI.equals(DOWNLOAD_URI));
do_check_true(!!page_in_database(DOWNLOAD_URI));

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

@ -129,7 +129,7 @@ function task_setCountDate(aURI, aCount, aDate)
for (let i = 0; i < aCount; i++) {
visits.push({ uri: aURI, visitDate: aDate, transition: TRANSITION_TYPED });
}
yield promiseAddVisits(visits);
yield PlacesTestUtils.addVisits(visits);
}
function setBookmark(aURI)

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

@ -25,6 +25,6 @@ add_task(function ()
do_check_eq(frecencyForUrl(TEST_URI), 0);
// Now add a valid visit to the page, frecency should increase.
yield promiseAddVisits({ uri: TEST_URI });
yield PlacesTestUtils.addVisits({ uri: TEST_URI });
do_check_true(frecencyForUrl(TEST_URI) > 0);
});

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

@ -30,7 +30,7 @@ function ensurePlacesInfoObjectsAreEqual(a, b) {
function test_getPlacesInfoExistentPlace() {
let testURI = NetUtil.newURI("http://www.example.tld");
yield promiseAddVisits(testURI);
yield PlacesTestUtils.addVisits(testURI);
let getPlacesInfoResult = yield promiseGetPlacesInfo([testURI]);
do_check_eq(getPlacesInfoResult.results.length, 1);
@ -56,7 +56,7 @@ add_task(test_getPlacesInfoNonExistentPlace);
function test_promisedHelper() {
let (uri = NetUtil.newURI("http://www.helper_existent_example.tld")) {
yield promiseAddVisits(uri);
yield PlacesTestUtils.addVisits(uri);
let placeInfo = yield PlacesUtils.promisePlaceInfo(uri);
do_check_true(placeInfo instanceof Ci.mozIPlaceInfo);
};
@ -73,7 +73,7 @@ add_task(test_promisedHelper);
function test_infoByGUID() {
let testURI = NetUtil.newURI("http://www.guid_example.tld");
yield promiseAddVisits(testURI);
yield PlacesTestUtils.addVisits(testURI);
let placeInfoByURI = yield PlacesUtils.promisePlaceInfo(testURI);
let placeInfoByGUID = yield PlacesUtils.promisePlaceInfo(placeInfoByURI.guid);
@ -93,12 +93,12 @@ add_task(test_invalid_guid);
function test_mixed_selection() {
let placeInfo1, placeInfo2;
let (uri = NetUtil.newURI("http://www.mixed_selection_test_1.tld")) {
yield promiseAddVisits(uri);
yield PlacesTestUtils.addVisits(uri);
placeInfo1 = yield PlacesUtils.promisePlaceInfo(uri);
};
let (uri = NetUtil.newURI("http://www.mixed_selection_test_2.tld")) {
yield promiseAddVisits(uri);
yield PlacesTestUtils.addVisits(uri);
placeInfo2 = yield PlacesUtils.promisePlaceInfo(uri);
};

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

@ -42,7 +42,7 @@ add_task(function test_execute()
// add a visit
var testURI = uri("http://mozilla.com");
yield promiseAddVisits(testURI);
yield PlacesTestUtils.addVisits(testURI);
// now query for the visit, setting sorting and limit such that
// we should retrieve only the visit we just added
@ -69,8 +69,8 @@ add_task(function test_execute()
// add another visit for the same URI, and a third visit for a different URI
var testURI2 = uri("http://google.com/");
yield promiseAddVisits(testURI);
yield promiseAddVisits(testURI2);
yield PlacesTestUtils.addVisits(testURI);
yield PlacesTestUtils.addVisits(testURI2);
options.maxResults = 5;
options.resultType = options.RESULTS_AS_URI;
@ -149,7 +149,7 @@ add_task(function test_execute()
do_check_true(!histsvc.historyDisabled);
// test getPageTitle
yield promiseAddVisits({ uri: uri("http://example.com"), title: "title" });
yield PlacesTestUtils.addVisits({ uri: uri("http://example.com"), title: "title" });
let placeInfo = yield PlacesUtils.promisePlaceInfo(uri("http://example.com"));
do_check_eq(placeInfo.title, "title");
@ -171,7 +171,7 @@ add_task(function test_execute()
}
// bug 394741 - regressed history text searches
yield promiseAddVisits(uri("http://mozilla.com"));
yield PlacesTestUtils.addVisits(uri("http://mozilla.com"));
var options = histsvc.getNewQueryOptions();
//options.resultType = options.RESULTS_AS_VISIT;
var query = histsvc.getNewQuery();

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

@ -49,7 +49,7 @@ add_task(function* () {
});
// Add a visit.
yield promiseAddVisits(uri("http://typed.mozilla.org"));
yield PlacesTestUtils.addVisits(uri("http://typed.mozilla.org"));
yield notificationsPromised;
});

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

@ -50,7 +50,7 @@ add_task(function* test_history_clear()
{
yield promiseInit;
yield promiseAddVisits([
yield PlacesTestUtils.addVisits([
{ uri: uri("http://typed.mozilla.org/"),
transition: TRANSITION_TYPED },
{ uri: uri("http://link.mozilla.org/"),
@ -85,7 +85,7 @@ add_task(function* test_history_clear()
PlacesUtils.bookmarks.DEFAULT_INDEX,
"bookmark");
yield promiseAddVisits([
yield PlacesTestUtils.addVisits([
{ uri: uri("http://typed.mozilla.org/"),
transition: TRANSITION_BOOKMARK },
{ uri: uri("http://frecency.mozilla.org/"),

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

@ -42,7 +42,7 @@ function onNotify(callback) {
function task_add_visit(uri, timestamp, transition) {
uri = uri || NetUtil.newURI("http://firefox.com/");
timestamp = timestamp || Date.now() * 1000;
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: uri,
transition: transition || TRANSITION_TYPED,
visitDate: timestamp
@ -137,7 +137,7 @@ add_task(function test_onTitleChanged() {
let [testuri] = yield task_add_visit();
let title = "test-title";
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: testuri,
title: title
});

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

@ -38,7 +38,7 @@ function task_add_normalized_visit(aURI, aTime, aDayOffset) {
var PRTimeWithOffset = (previousDateObj.getTime() - DSTCorrection) * 1000;
var timeInMs = new Date(PRTimeWithOffset/1000);
print("Adding visit to " + aURI.spec + " at " + timeInMs);
yield promiseAddVisits({
yield PlacesTestUtils.addVisits({
uri: aURI,
visitDate: PRTimeWithOffset
});

Some files were not shown because too many files have changed in this diff Show More