зеркало из https://github.com/mozilla/gecko-dev.git
Bug 831725 - Fix wrong merge on toolkit/components/places/tests/browser/head.js
r=me
This commit is contained in:
Marco Bonardo
Родитель
8e850597e5
Коммит
88dc089d5b
|
|
@ -346,227 +346,3 @@ function whenNewWindowLoaded(aOptions, aCallback) {
|
|||
aCallback(win);
|
||||
}, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generic nsINavHistoryObserver that doesn't implement anything, but provides
|
||||
* dummy methods to prevent errors about an object not having a certain method.
|
||||
*/
|
||||
function NavHistoryObserver() {}
|
||||
|
||||
NavHistoryObserver.prototype = {
|
||||
onBeginUpdateBatch: function () {},
|
||||
onEndUpdateBatch: function () {},
|
||||
onVisit: function () {},
|
||||
onTitleChanged: function () {},
|
||||
onBeforeDeleteURI: function () {},
|
||||
onDeleteURI: function () {},
|
||||
onClearHistory: function () {},
|
||||
onPageChanged: function () {},
|
||||
onDeleteVisits: function () {},
|
||||
QueryInterface: XPCOMUtils.generateQI([
|
||||
Ci.nsINavHistoryObserver,
|
||||
])
|
||||
};
|
||||
|
||||
/**
|
||||
* Waits for the first OnPageChanged notification for ATTRIBUTE_FAVICON, and
|
||||
* verifies that it matches the expected page URI and associated favicon URI.
|
||||
*
|
||||
* This function also double-checks the GUID parameter of the notification.
|
||||
*
|
||||
* @param aExpectedPageURI
|
||||
* nsIURI object of the page whose favicon should change.
|
||||
* @param aExpectedFaviconURI
|
||||
* nsIURI object of the newly associated favicon.
|
||||
* @param aCallback
|
||||
* This function is called after the check finished.
|
||||
*/
|
||||
function waitForFaviconChanged(aExpectedPageURI, aExpectedFaviconURI, aWindow,
|
||||
aCallback) {
|
||||
let historyObserver = {
|
||||
__proto__: NavHistoryObserver.prototype,
|
||||
onPageChanged: function WFFC_onPageChanged(aURI, aWhat, aValue, aGUID) {
|
||||
if (aWhat != Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON) {
|
||||
return;
|
||||
}
|
||||
aWindow.PlacesUtils.history.removeObserver(this);
|
||||
|
||||
ok(aURI.equals(aExpectedPageURI),
|
||||
"Check URIs are equal for the page which favicon changed");
|
||||
is(aValue, aExpectedFaviconURI.spec,
|
||||
"Check changed favicon URI is the expected");
|
||||
checkGuidForURI(aURI, aGUID);
|
||||
|
||||
if (aCallback) {
|
||||
aCallback();
|
||||
}
|
||||
}
|
||||
};
|
||||
aWindow.PlacesUtils.history.addObserver(historyObserver, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Asynchronously adds visits to a page, invoking a callback function when done.
|
||||
*
|
||||
* @param aPlaceInfo
|
||||
* Can be an nsIURI, in such a case a single LINK visit will be added.
|
||||
* Otherwise can be an object describing the visit to add, or an array
|
||||
* of these objects:
|
||||
* { uri: nsIURI of the page,
|
||||
* transition: one of the TRANSITION_* from nsINavHistoryService,
|
||||
* [optional] title: title of the page,
|
||||
* [optional] visitDate: visit date in microseconds from the epoch
|
||||
* [optional] referrer: nsIURI of the referrer for this visit
|
||||
* }
|
||||
* @param [optional] aCallback
|
||||
* Function to be invoked on completion.
|
||||
* @param [optional] aStack
|
||||
* The stack frame used to report errors.
|
||||
*/
|
||||
function addVisits(aPlaceInfo, aWindow, aCallback, aStack) {
|
||||
let stack = aStack || Components.stack.caller;
|
||||
let places = [];
|
||||
if (aPlaceInfo instanceof Ci.nsIURI) {
|
||||
places.push({ uri: aPlaceInfo });
|
||||
}
|
||||
else if (Array.isArray(aPlaceInfo)) {
|
||||
places = places.concat(aPlaceInfo);
|
||||
} else {
|
||||
places.push(aPlaceInfo)
|
||||
}
|
||||
|
||||
// Create mozIVisitInfo for each entry.
|
||||
let now = Date.now();
|
||||
for (let i = 0; i < places.length; i++) {
|
||||
if (!places[i].title) {
|
||||
places[i].title = "test visit for " + places[i].uri.spec;
|
||||
}
|
||||
places[i].visits = [{
|
||||
transitionType: places[i].transition === undefined ? TRANSITION_LINK
|
||||
: places[i].transition,
|
||||
visitDate: places[i].visitDate || (now++) * 1000,
|
||||
referrerURI: places[i].referrer
|
||||
}];
|
||||
}
|
||||
|
||||
aWindow.PlacesUtils.asyncHistory.updatePlaces(
|
||||
places,
|
||||
{
|
||||
handleError: function AAV_handleError() {
|
||||
throw("Unexpected error in adding visit.");
|
||||
},
|
||||
handleResult: function () {},
|
||||
handleCompletion: function UP_handleCompletion() {
|
||||
if (aCallback)
|
||||
aCallback();
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks that the favicon for the given page matches the provided data.
|
||||
*
|
||||
* @param aPageURI
|
||||
* nsIURI object for the page to check.
|
||||
* @param aExpectedMimeType
|
||||
* Expected MIME type of the icon, for example "image/png".
|
||||
* @param aExpectedData
|
||||
* Expected icon data, expressed as an array of byte values.
|
||||
* @param aCallback
|
||||
* This function is called after the check finished.
|
||||
*/
|
||||
function checkFaviconDataForPage(aPageURI, aExpectedMimeType, aExpectedData,
|
||||
aWindow, aCallback) {
|
||||
aWindow.PlacesUtils.favicons.getFaviconDataForPage(aPageURI,
|
||||
function (aURI, aDataLen, aData, aMimeType) {
|
||||
is(aExpectedMimeType, aMimeType, "Check expected MimeType");
|
||||
is(aExpectedData.length, aData.length,
|
||||
"Check favicon data for the given page matches the provided data");
|
||||
checkGuidForURI(aPageURI);
|
||||
aCallback();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that a guid was set in moz_places for a given uri.
|
||||
*
|
||||
* @param aURI
|
||||
* The uri to check.
|
||||
* @param [optional] aGUID
|
||||
* The expected guid in the database.
|
||||
*/
|
||||
function checkGuidForURI(aURI, aGUID) {
|
||||
let guid = doGetGuidForURI(aURI);
|
||||
if (aGUID) {
|
||||
doCheckValidPlacesGuid(aGUID);
|
||||
is(guid, aGUID, "Check equal guid for URIs");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the guid for a given uri.
|
||||
*
|
||||
* @param aURI
|
||||
* The uri to check.
|
||||
* @return the associated the guid.
|
||||
*/
|
||||
function doGetGuidForURI(aURI) {
|
||||
let stmt = DBConn().createStatement(
|
||||
"SELECT guid "
|
||||
+ "FROM moz_places "
|
||||
+ "WHERE url = :url "
|
||||
);
|
||||
stmt.params.url = aURI.spec;
|
||||
ok(stmt.executeStep(), "Check get guid for uri from moz_places");
|
||||
let guid = stmt.row.guid;
|
||||
stmt.finalize();
|
||||
doCheckValidPlacesGuid(guid);
|
||||
return guid;
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if a given guid is valid for use in Places or not.
|
||||
*
|
||||
* @param aGuid
|
||||
* The guid to test.
|
||||
*/
|
||||
function doCheckValidPlacesGuid(aGuid) {
|
||||
ok(/^[a-zA-Z0-9\-_]{12}$/.test(aGuid), "Check guid for valid places");
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the database connection. If the Places connection is invalid it will
|
||||
* try to create a new connection.
|
||||
*
|
||||
* @param [optional] aForceNewConnection
|
||||
* Forces creation of a new connection to the database. When a
|
||||
* connection is asyncClosed it cannot anymore schedule async statements,
|
||||
* though connectionReady will keep returning true (Bug 726990).
|
||||
*
|
||||
* @return The database connection or null if unable to get one.
|
||||
*/
|
||||
function DBConn(aForceNewConnection) {
|
||||
let gDBConn;
|
||||
if (!aForceNewConnection) {
|
||||
let db = PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase)
|
||||
.DBConnection;
|
||||
if (db.connectionReady)
|
||||
return db;
|
||||
}
|
||||
|
||||
// If the Places database connection has been closed, create a new connection.
|
||||
if (!gDBConn || aForceNewConnection) {
|
||||
let file = Services.dirsvc.get('ProfD', Ci.nsIFile);
|
||||
file.append("places.sqlite");
|
||||
let dbConn = gDBConn = Services.storage.openDatabase(file);
|
||||
|
||||
// Be sure to cleanly close this connection.
|
||||
Services.obs.addObserver(function DBCloseCallback(aSubject, aTopic, aData) {
|
||||
Services.obs.removeObserver(DBCloseCallback, aTopic);
|
||||
dbConn.asyncClose();
|
||||
}, "profile-before-change", false);
|
||||
}
|
||||
|
||||
return gDBConn.connectionReady ? gDBConn : null;
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче