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

Back out fae3603a8d1d (bug 699856) for test hangs on Windows

Browse Source
This commit is contained in:
Phil Ringnalda 2012-03-02 14:12:34 -08:00
parent 024021d367
commit 8118c7707e
13 changed files with 167 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

415
toolkit/components/search/nsSearchService.js
View File

@ -43,7 +43,6 @@ const Cc = Components.classes;
const Cr = Components.results;
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
const PERMS_FILE = 0644;
const PERMS_DIRECTORY = 0755;
@ -77,19 +76,6 @@ const SEARCH_ENGINE_CHANGED = "engine-changed";
const SEARCH_ENGINE_LOADED = "engine-loaded";
const SEARCH_ENGINE_CURRENT = "engine-current";
// The following constants are left undocumented in nsIBrowserSearchService.idl
// For the moment, they are meant for testing/debugging purposes only.
/**
* Topic used for events involving the service itself.
*/
const SEARCH_SERVICE_TOPIC = "browser-search-service";
/**
* Sent whenever metadata is fully written to disk.
*/
const SEARCH_SERVICE_METADATA_WRITTEN = "write-metadata-to-disk-complete";
const SEARCH_TYPE_MOZSEARCH = Ci.nsISearchEngine.TYPE_MOZSEARCH;
const SEARCH_TYPE_OPENSEARCH = Ci.nsISearchEngine.TYPE_OPENSEARCH;
const SEARCH_TYPE_SHERLOCK = Ci.nsISearchEngine.TYPE_SHERLOCK;
@ -232,12 +218,6 @@ __defineGetter__("gPrefSvc", function() {
getService(Ci.nsIPrefBranch);
});
__defineGetter__("FileUtils", function() {
delete this.FileUtils;
Components.utils.import("resource://gre/modules/FileUtils.jsm");
return FileUtils;
});
__defineGetter__("NetUtil", function() {
delete this.NetUtil;
Components.utils.import("resource://gre/modules/NetUtil.jsm");
@ -329,64 +309,6 @@ function ENSURE_WARN(assertion, message, resultCode) {
throw Components.Exception(message, resultCode);
}
/**
* A delayed treatment that may be delayed even further.
*
* Use this for instance if you write data to a file and you expect
* that you may have to rewrite data very soon afterwards. With
* |Lazy|, the treatment is delayed by a few milliseconds and,
* should a new change to the data occur during this period,
* 1/ only the final version of the data is actually written;
* 2/ a further grace delay is added to take into account other
* changes.
*
* @constructor
* @param {Function} code The code to execute after the delay.
* @param {number=} delay An optional delay, in milliseconds.
*/
function Lazy(code, delay) {
LOG("Lazy: Creating a Lazy");
this._callback =
(function(){
code();
this._timer = null;
}).bind(this);
this._delay = delay || LAZY_SERIALIZE_DELAY;
this._timer = null;
}
Lazy.prototype = {
/**
* Start (or postpone) treatment.
*/
go: function Lazy_go() {
LOG("Lazy_go: starting");
if (this._timer) {
LOG("Lazy_go: reusing active timer");
this._timer.delay = this._delay;
} else {
LOG("Lazy_go: creating timer");
this._timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
this._timer.
initWithCallback(this._callback,
this._delay,
Ci.nsITimer.TYPE_ONE_SHOT);
}
},
/**
* Perform any postponed treatment immediately.
*/
flush: function Lazy_flush() {
LOG("Lazy_flush: starting");
if (!this._timer) {
return;
}
this._timer.cancel();
this._timer = null;
this._callback();
}
};
function loadListener(aChannel, aEngine, aCallback) {
this._channel = aChannel;
this._bytes = [];
@ -796,12 +718,6 @@ function notifyAction(aEngine, aVerb) {
}
}
function parseJsonFromStream(aInputStream) {
const json = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON);
const data = json.decodeFromStream(aInputStream, aInputStream.available());
return data;
}
/**
* Simple object representing a name/value pair.
*/
@ -2660,7 +2576,6 @@ SearchService.prototype = {
},
_loadEngines: function SRCH_SVC__loadEngines() {
LOG("_loadEngines: start");
// See if we have a cache file so we don't have to parse a bunch of XML.
let cache = {};
let cacheEnabled = getBoolPref(BROWSER_SEARCH_PREF + "cache.enabled", true);
@ -2718,11 +2633,8 @@ SearchService.prototype = {
return;
}
LOG("_loadEngines: loading from cache directories");
for each (let dir in cache.directories)
this._loadEnginesFromCache(dir);
LOG("_loadEngines: done");
},
_readCacheFile: function SRCH_SVC__readCacheFile(aFile) {
@ -2898,7 +2810,7 @@ SearchService.prototype = {
try {
this._convertSherlockFile(addedEngine, fileURL.fileBaseName);
} catch (ex) {
LOG("_loadEnginesFromDir: Failed to convert: " + fileURL.path + "\n" + ex + "\n" + ex.stack);
LOG("_loadEnginesFromDir: Failed to convert: " + fileURL.path + "\n" + ex);
// The engine couldn't be converted, mark it as read-only
addedEngine._readOnly = true;
}
@ -2995,29 +2907,23 @@ SearchService.prototype = {
_saveSortedEngineList: function SRCH_SVC_saveSortedEngineList() {
// We only need to write the prefs. if something has changed.
LOG("SRCH_SVC_saveSortedEngineList: starting");
if (!this._needToSetOrderPrefs)
return;
LOG("SRCH_SVC_saveSortedEngineList: something to do");
// Set the useDB pref to indicate that from now on we should use the order
// information stored in the database.
gPrefSvc.setBoolPref(BROWSER_SEARCH_PREF + "useDBForOrder", true);
var engines = this._getSortedEngines(true);
var values = [];
var names = [];
let instructions = [];
for (var i = 0; i < engines.length; ++i) {
instructions.push(
{key: "order",
value: i+1,
engine: engines[i]
});
names[i] = "order";
values[i] = i + 1;
}
engineMetadataService.setAttrs(instructions);
LOG("SRCH_SVC_saveSortedEngineList: done");
engineMetadataService.setAttrs(engines, names, values);
},
_buildSortedEngineList: function SRCH_SVC_buildSortedEngineList() {
@ -3030,7 +2936,6 @@ SearchService.prototype = {
// information from the engineMetadataService instead of the default
// prefs.
if (getBoolPref(BROWSER_SEARCH_PREF + "useDBForOrder", false)) {
LOG("_buildSortedEngineList: using db for order");
for each (engine in this._engines) {
var orderNumber = engineMetadataService.getAttr(engine, "order");
@ -3529,7 +3434,7 @@ SearchService.prototype = {
this._batchTimer.cancel();
this._buildCache();
}
engineMetadataService.flush();
engineMetadataService.closeDB();
break;
}
},
@ -3594,215 +3499,135 @@ SearchService.prototype = {
};
var engineMetadataService = {
/**
* @type {nsIFile|null} The file holding the metadata.
*/
get _jsonFile() {
delete this._jsonFile;
return this._jsonFile = FileUtils.getFile(NS_APP_USER_PROFILE_50_DIR,
["search-metadata.json"]);
},
/**
* Lazy getter for the file containing json data.
*/
get _store() {
delete this._store;
return this._store = this._loadStore();
},
// Perform loading the first time |_store| is accessed.
_loadStore: function() {
let jsonFile = this._jsonFile;
if (!jsonFile.exists()) {
LOG("loadStore: search-metadata.json does not exist");
// First check to see whether there's an existing SQLite DB to migrate
let store = this._migrateOldDB();
if (store) {
// Commit the migrated store to disk immediately
LOG("Committing the migrated store to disk");
this._commit(store);
return store;
}
// Migration failed, or this is a first-run - just use an empty store
return {};
}
LOG("loadStore: attempting to load store from JSON file");
get mDB() {
var engineDataTable = "id INTEGER PRIMARY KEY, engineid STRING, name STRING, value STRING";
var file = getDir(NS_APP_USER_PROFILE_50_DIR);
file.append("search.sqlite");
var dbService = Cc["@mozilla.org/storage/service;1"].
getService(Ci.mozIStorageService);
var db;
try {
return parseJsonFromStream(NetUtil.newChannel(jsonFile).open());
} catch (x) {
LOG("loadStore failed to load file: "+x);
return {};
db = dbService.openDatabase(file);
} catch (ex) {
if (ex.result == 0x8052000b) { /* NS_ERROR_FILE_CORRUPTED */
// delete and try again
file.remove(false);
db = dbService.openDatabase(file);
} else {
throw ex;
}
}
try {
db.createTable("engine_data", engineDataTable);
} catch (ex) {
// Fails if the table already exists, which is fine
}
delete this.mDB;
return this.mDB = db;
},
get mGetData() {
delete this.mGetData;
return this.mGetData = this.mDB.createStatement(
"SELECT value FROM engine_data WHERE engineid = :engineid AND name = :name");
},
get mDeleteData() {
delete this.mDeleteData;
return this.mDeleteData = this.mDB.createStatement(
"DELETE FROM engine_data WHERE engineid = :engineid AND name = :name");
},
get mInsertData() {
delete this.mInsertData;
return this.mInsertData = this.mDB.createStatement(
"INSERT INTO engine_data (engineid, name, value) " +
"VALUES (:engineid, :name, :value)");
},
getAttr: function epsGetAttr(engine, name) {
let record = this._store[engine._id];
if (!record) {
return null;
}
// attr names must be lower case
return record[name.toLowerCase()];
},
_setAttr: function epsSetAttr(engine, name, value) {
// attr names must be lower case
name = name.toLowerCase();
let db = this._store;
let record = db[engine._id];
if (!record) {
record = db[engine._id] = {};
}
if (record[name] != value) {
record[name] = value;
return true;
}
return false;
var stmt = this.mGetData;
stmt.reset();
var pp = stmt.params;
pp.engineid = engine._id;
pp.name = name;
var value = null;
if (stmt.executeStep())
value = stmt.row.value;
stmt.reset();
return value;
},
/**
* Set one metadata attribute for an engine.
*
* If an actual change has taken place, the attribute is committed
* automatically (and lazily), using this._commit.
*
* @param {nsISearchEngine} engine The engine to update.
* @param {string} key The name of the attribute. Case-insensitive. In
* the current implementation, this _must not_ conflict with properties
* of |Object|.
* @param {*} value A value to store.
*/
setAttr: function epsSetAttr(engine, key, value) {
if (this._setAttr(engine, key, value)) {
this._commit();
}
setAttr: function epsSetAttr(engine, name, value) {
// attr names must be lower case
name = name.toLowerCase();
this.mDB.beginTransaction();
var pp = this.mDeleteData.params;
pp.engineid = engine._id;
pp.name = name;
this.mDeleteData.executeStep();
this.mDeleteData.reset();
pp = this.mInsertData.params;
pp.engineid = engine._id;
pp.name = name;
pp.value = value;
this.mInsertData.executeStep();
this.mInsertData.reset();
this.mDB.commitTransaction();
},
/**
* Bulk set metadata attributes for a number of engines.
*
* If actual changes have taken place, the store is committed
* automatically (and lazily), using this._commit.
*
* @param {Array.<{engine: nsISearchEngine, key: string, value: *}>} changes
* The list of changes to effect. See |setAttr| for the documentation of
* |engine|, |key|, |value|.
*/
setAttrs: function epsSetAttrs(changes) {
let self = this;
let changed = false;
changes.forEach(function(change) {
changed |= self._setAttr(change.engine, change.key, change.value);
});
if (changed) {
this._commit();
setAttrs: function epsSetAttrs(engines, names, values) {
this.mDB.beginTransaction();
for (var i = 0; i < engines.length; i++) {
// attr names must be lower case
var name = names[i].toLowerCase();
var pp = this.mDeleteData.params;
pp.engineid = engines[i]._id;
pp.name = names[i];
this.mDeleteData.executeStep();
this.mDeleteData.reset();
pp = this.mInsertData.params;
pp.engineid = engines[i]._id;
pp.name = names[i];
pp.value = values[i];
this.mInsertData.executeStep();
this.mInsertData.reset();
}
this.mDB.commitTransaction();
},
/**
* Flush any waiting write.
*/
flush: function epsFlush() {
if (this._lazyWriter) {
this._lazyWriter.flush();
}
deleteEngineData: function epsDelData(engine, name) {
// attr names must be lower case
name = name.toLowerCase();
var pp = this.mDeleteData.params;
pp.engineid = engine._id;
pp.name = name;
this.mDeleteData.executeStep();
this.mDeleteData.reset();
},
/**
* Migrate search.sqlite
*
* Notes:
* - we do not remove search.sqlite after migration, so as to allow
* downgrading and forensics;
*/
_migrateOldDB: function SRCH_SVC_EMS_migrate() {
LOG("SRCH_SVC_EMS_migrate start");
let sqliteFile = FileUtils.getFile(NS_APP_USER_PROFILE_50_DIR,
["search.sqlite"]);
if (!sqliteFile.exists()) {
LOG("SRCH_SVC_EMS_migrate search.sqlite does not exist");
return null;
}
let store = {};
try {
LOG("SRCH_SVC_EMS_migrate Migrating data from SQL");
const sqliteDb = Services.storage.openDatabase(sqliteFile);
const statement = sqliteDb.createStatement("SELECT * from engine_data");
while (statement.executeStep()) {
let row = statement.row;
let engine = row.engineid;
let name = row.name;
let value = row.value;
if (!store[engine]) {
store[engine] = {};
}
store[engine][name] = value;
}
statement.finalize();
} catch (ex) {
LOG("SRCH_SVC_EMS_migrate failed: " + ex);
return null;
}
return store;
},
/**
* Commit changes to disk, asynchronously.
*
* Calls to this function are actually delayed by LAZY_SERIALIZE_DELAY
* (= 100ms). If the function is called again before the expiration of
* the delay, commits are merged and the function is again delayed by
* the same amount of time.
*
* @param aStore is an optional parameter specifying the object to serialize.
* If not specified, this._store is used.
*/
_commit: function epsCommit(aStore) {
LOG("epsCommit: start");
let store = aStore || this._store;
if (!store) {
LOG("epsCommit: nothing to do");
return;
}
if (!this._lazyWriter) {
LOG("epsCommit: initializing lazy writer");
let jsonFile = this._jsonFile;
function writeCommit() {
LOG("epsWriteCommit: start");
let ostream = FileUtils.
openSafeFileOutputStream(jsonFile,
MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE);
// Obtain a converter to convert our data to a UTF-8 encoded input stream.
let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
createInstance(Ci.nsIScriptableUnicodeConverter);
converter.charset = "UTF-8";
let callback = function(result) {
if (Components.isSuccessCode(result)) {
gObsSvc.notifyObservers(null,
SEARCH_SERVICE_TOPIC,
SEARCH_SERVICE_METADATA_WRITTEN);
}
LOG("epsWriteCommit: done " + result);
};
// Asynchronously copy the data to the file.
let istream = converter.convertToInputStream(JSON.stringify(store));
NetUtil.asyncCopy(istream, ostream, callback);
}
this._lazyWriter = new Lazy(writeCommit);
}
LOG("epsCommit: (re)setting timer");
this._lazyWriter.go();
},
_lazyWriter: null,
};
closeDB: function epsCloseDB() {
["mInsertData", "mDeleteData", "mGetData"].forEach(function(aStmt) {
if (Object.getOwnPropertyDescriptor(this, aStmt).value !== undefined)
this[aStmt].finalize();
}, this);
if (Object.getOwnPropertyDescriptor(this, "mDB").value !== undefined)
this.mDB.close();
}
}
const SEARCH_UPDATE_LOG_PREFIX = "*** Search update: ";

2
toolkit/components/search/tests/xpcshell/data/chrome.manifest
View File

@ -1,3 +1 @@
locale testsearchplugin ar jar:jar:searchTest.jar!/chrome/searchTest.jar!/
content testsearchplugin ./

18
toolkit/components/search/tests/xpcshell/data/engine.src
View File

@ -1,18 +0,0 @@
<SEARCH
version="1"
name="Sherlock test search engine"
description="A test search engine for testing sherlock"
method="GET"
action="http://getfirefox.com"
searchform="http://getfirefox.com"
>
<input name="q" user>
</search>
<BROWSER
update="http://getfirefox.com"
updateIcon="http://getfirefox.com"
updatecheckdays="7"
>

18
toolkit/components/search/tests/xpcshell/data/engine.xml
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
<ShortName>Test search engine</ShortName>
<Description>A test search engine (based on Google search)</Description>
<InputEncoding>UTF-8</InputEncoding>
<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl={moz:locale}&amp;q={searchTerms}"/>
<Url type="text/html" method="GET" template="http://www.google.com/search">
<Param name="q" value="{searchTerms}"/>
<Param name="ie" value="utf-8"/>
<Param name="oe" value="utf-8"/>
<Param name="aq" value="t"/>
<!-- Dynamic parameters -->
<Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
<MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
</Url>
<SearchForm>http://www.google.com/</SearchForm>
</SearchPlugin>

BIN
toolkit/components/search/tests/xpcshell/data/ico-size-16x16-png.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 901 B

28
toolkit/components/search/tests/xpcshell/data/search-metadata.json
View File

@ -1,28 +0,0 @@
{
"[app]/amazondotcom.xml": {
"used": 0,
"order": 4
},
"[app]/eBay.xml": {
"used": 0,
"order": 1
},
"[app]/wikipedia.xml": {
"used": 0,
"order": 6
},
"[app]/twitter.xml": {
"used": 0,
"order": 7
},
"[app]/google.xml": {
"used": 1,
"order": 2
},
"[app]/bing.xml": {
"order": 5
},
"[app]/yahoo.xml": {
"order": 3
}
}

BIN
toolkit/components/search/tests/xpcshell/data/search.sqlite
View File

Binary file not shown.

83
toolkit/components/search/tests/xpcshell/head_search.js
View File

@ -1,10 +1,37 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et: */
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/NetUtil.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Initial Developer of the Original Code is POTI Inc.
* Portions created by the Initial Developer are Copyright (C) 2007
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1";
const XULAPPINFO_CID = Components.ID("{c763b610-9d49-455a-bbd2-ede71682a1ac}");
@ -63,49 +90,3 @@ function createAppInfo(id, name, version, platformVersion)
// Need to create and register a profile folder.
var gProfD = do_get_profile();
function dumpn(text)
{
dump(text+"\n");
}
/**
* Clean the profile of any metadata files left from a previous run.
*/
function removeMetadata()
{
let file = gProfD.clone();
file.append("search-metadata.json");
if (file.exists()) {
file.remove(false);
}
file = gProfD.clone();
file.append("search.sqlite");
if (file.exists()) {
file.remove(false);
}
}
/**
* Run some callback once metadata has been committed to disk.
*/
function afterCommit(callback)
{
let obs = function(result, topic, verb) {
if (verb == "write-metadata-to-disk-complete") {
callback(result);
} else {
dump("TOPIC: " + topic+ "\n");
}
}
Services.obs.addObserver(obs, "browser-search-service", false);
}
function parseJsonFromStream(aInputStream) {
const json = Cc["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON);
const data = json.decodeFromStream(aInputStream, aInputStream.available());
return data;
}
Services.prefs.setBoolPref("browser.search.log", true);
//Otherwise, error logs contain no useful data

18
toolkit/components/search/tests/xpcshell/test_645970.js
View File

@ -33,6 +33,16 @@
*
* ***** END LICENSE BLOCK ***** */
let Cc = Components.classes;
let Ci = Components.interfaces;
let Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
var gPrefService = Cc["@mozilla.org/preferences-service;1"]
.getService(Ci.nsIPrefService)
.QueryInterface(Ci.nsIPrefBranch);
/**
* Test nsSearchService with nested jar: uris
*/
@ -42,13 +52,15 @@ function run_test() {
do_load_manifest("data/chrome.manifest");
let url = "chrome://testsearchplugin/locale/searchplugins/";
Services.prefs.setCharPref("browser.search.jarURIs", url);
gPrefService.setCharPref("browser.search.jarURIs", url);
Services.prefs.setBoolPref("browser.search.loadFromJars", true);
gPrefService.setBoolPref("browser.search.loadFromJars", true);
// The search service needs to be started after the jarURIs pref has been
// set in order to initiate it correctly
let engine = Services.search.getEngineByName("bug645970");
let searchService = Cc["@mozilla.org/browser/search-service;1"]
.getService(Ci.nsIBrowserSearchService);
let engine = searchService.getEngineByName("bug645970");
do_check_neq(engine, null);
Services.obs.notifyObservers(null, "quit-application", null);
}

38
toolkit/components/search/tests/xpcshell/test_migratedb.js
View File

@ -1,38 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/*
* test_migratedb: Start search engine
* - without search-metadata.json
* - with search.sqlite
*
* Ensure that nothing explodes.
*/
function run_test()
{
removeMetadata();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "2");
let search_sqlite = do_get_file("data/search.sqlite");
search_sqlite.copyTo(gProfD, "search.sqlite");
let search = Services.search;
do_test_pending();
afterCommit(
function()
{
//Check that search-metadata.json has been created
let metadata = gProfD.clone();
metadata.append("search-metadata.json");
do_check_true(metadata.exists());
removeMetadata();
do_test_finished();
}
);
search.getEngines();
}

37
toolkit/components/search/tests/xpcshell/test_nodb.js
View File

@ -1,37 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/*
* test_nodb: Start search engine
* - without search-metadata.json
* - without search.sqlite
*
* Ensure that :
* - nothing explodes;
* - no search-metadata.json is created.
*/
function run_test()
{
removeMetadata();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "2");
let search = Services.search; // Cause service initialization
do_test_pending();
do_timeout(500,
function()
{
// Check that search-metadata.json has not been created
// Note that we cannot du much better than a timeout for
// checking a non-event.
let metadata = gProfD.clone();
metadata.append("search-metadata.json");
do_check_true(!metadata.exists());
removeMetadata();
do_test_finished();
}
);
}

86
toolkit/components/search/tests/xpcshell/test_nodb_pluschanges.js
View File

@ -1,86 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/*
* test_nodb: Start search engine
* - without search-metadata.json
* - without search.sqlite
*
* Ensure that :
* - nothing explodes;
* - if we change the order, search-metadata.json is created;
* - this search-medata.json can be parsed;
* - the order stored in search-metadata.json is consistent.
*
* Notes:
* - we install the search engines of test "test_downloadAndAddEngines.js"
* to ensure that this test is independent from locale, commercial agreements
* and configuration of Firefox.
*/
do_load_httpd_js();
function run_test()
{
removeMetadata();
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "2");
do_load_manifest("data/chrome.manifest");
let httpServer = new nsHttpServer();
httpServer.start(4444);
httpServer.registerDirectory("/", do_get_cwd());
let search = Services.search;
function observer(aSubject, aTopic, aData) {
if ("engine-added" == aData) {
let engine1 = search.getEngineByName("Test search engine");
let engine2 = search.getEngineByName("Sherlock test search engine");
dumpn("Got engine 2: "+engine2);
if(engine1 && engine2)
{
search.moveEngine(engine1, 0);
search.moveEngine(engine2, 1);
do_timeout(0,
function() {
// Force flush
// Note: the timeout is needed, to avoid some reentrency
// issues in nsSearchService.
search.QueryInterface(Ci.nsIObserver).
observe(observer, "quit-application", "<no verb>");
});
afterCommit(
function()
{
//Check that search-metadata.json has been created
let metadata = gProfD.clone();
metadata.append("search-metadata.json");
do_check_true(metadata.exists());
//Check that the entries are placed as specified correctly
let json = parseJsonFromStream(
NetUtil.newChannel(metadata).open());
do_check_eq(json["[app]/test-search-engine.xml"].order, 1);
do_check_eq(json["[profile]/sherlock-test-search-engine.xml"].order, 2);
removeMetadata();
httpServer.stop(function() {});
do_test_finished();
}
);
}
}
};
Services.obs.addObserver(observer, "browser-search-engine-modified",
false);
do_test_pending();
search.addEngine("http://localhost:4444/data/engine.xml",
Ci.nsISearchEngine.DATA_XML,
null, false);
search.addEngine("http://localhost:4444/data/engine.src",
Ci.nsISearchEngine.DATA_TEXT,
"http://localhost:4444/data/ico-size-16x16-png.ico",
false);
}

3
toolkit/components/search/tests/xpcshell/xpcshell.ini
View File

@ -2,7 +2,4 @@
head = head_search.js
tail =
[test_nodb.js]
[test_nodb_pluschanges.js]
[test_migratedb.js]
[test_645970.js]