зеркало из https://github.com/mozilla/gecko-dev.git
Bug 438653 - move remaining browser tests to xpcshell/chrome tests
This moves the two remaining browser tests in toolkit/mozapps/downloads/tests to an xpcshell test and a chrome test. The reason for this change is to remove the dependency of the browser from download manager tests since it is a toolkit component. This version unregisters the factory that we register to override the prompt service in test_bug_412360.xul so we no longer leak. r=gavin --HG-- rename : toolkit/mozapps/downloads/tests/browser/browser_bug_406857.js => toolkit/components/downloads/test/unit/test_bug_406857.js rename : toolkit/mozapps/downloads/tests/browser/browser_bug_412360.js => toolkit/mozapps/downloads/tests/chrome/test_bug_412360.xul
This commit is contained in:
Родитель
4fa455df65
Коммит
e21f72ead8
|
@ -39,15 +39,12 @@
|
||||||
* retrying the download.
|
* retrying the download.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function test()
|
function run_test()
|
||||||
{
|
{
|
||||||
let dm = Cc["@mozilla.org/download-manager;1"].
|
let dm = Cc["@mozilla.org/download-manager;1"].
|
||||||
getService(Ci.nsIDownloadManager);
|
getService(Ci.nsIDownloadManager);
|
||||||
let db = dm.DBConnection;
|
let db = dm.DBConnection;
|
||||||
|
|
||||||
// Empty any old downloads
|
|
||||||
db.executeSimpleSQL("DELETE FROM moz_downloads");
|
|
||||||
|
|
||||||
let stmt = db.createStatement(
|
let stmt = db.createStatement(
|
||||||
"INSERT INTO moz_downloads (source, target, state, referrer) " +
|
"INSERT INTO moz_downloads (source, target, state, referrer) " +
|
||||||
"VALUES (?1, ?2, ?3, ?4)");
|
"VALUES (?1, ?2, ?3, ?4)");
|
||||||
|
@ -79,46 +76,22 @@ function test()
|
||||||
{
|
{
|
||||||
switch (aDownload.state) {
|
switch (aDownload.state) {
|
||||||
case dm.DOWNLOAD_DOWNLOADING:
|
case dm.DOWNLOAD_DOWNLOADING:
|
||||||
ok(aDownload.referrer.spec == referrer, "Got referrer on download");
|
do_check_eq(aDownload.referrer.spec, referrer);
|
||||||
break;
|
break;
|
||||||
case dm.DOWNLOAD_FINISHED:
|
case dm.DOWNLOAD_FINISHED:
|
||||||
ok(aDownload.referrer.spec == referrer, "Got referrer on finish");
|
do_check_eq(aDownload.referrer.spec, referrer);
|
||||||
|
|
||||||
dm.removeListener(listener);
|
dm.removeListener(listener);
|
||||||
obs.removeObserver(testObs, DLMGR_UI_DONE);
|
|
||||||
try { file.remove(false); } catch(e) { /* stupid windows box */ }
|
try { file.remove(false); } catch(e) { /* stupid windows box */ }
|
||||||
finish();
|
do_test_finished();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
dm.addListener(listener);
|
dm.addListener(listener);
|
||||||
|
|
||||||
// Close the UI if necessary
|
// Retry the download, and wait.
|
||||||
let wm = Cc["@mozilla.org/appshell/window-mediator;1"].
|
dm.retryDownload(1);
|
||||||
getService(Ci.nsIWindowMediator);
|
|
||||||
let win = wm.getMostRecentWindow("Download:Manager");
|
|
||||||
if (win) win.close();
|
|
||||||
|
|
||||||
let obs = Cc["@mozilla.org/observer-service;1"].
|
do_test_pending();
|
||||||
getService(Ci.nsIObserverService);
|
|
||||||
const DLMGR_UI_DONE = "download-manager-ui-done";
|
|
||||||
|
|
||||||
let testObs = {
|
|
||||||
observe: function(aSubject, aTopic, aData) {
|
|
||||||
if (aTopic != DLMGR_UI_DONE)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// Send the enter key to Download Manager to retry the download
|
|
||||||
let win = aSubject.QueryInterface(Ci.nsIDOMWindow);
|
|
||||||
EventUtils.synthesizeKey("VK_ENTER", {}, win);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
obs.addObserver(testObs, DLMGR_UI_DONE, false);
|
|
||||||
|
|
||||||
// Show the Download Manager UI
|
|
||||||
Cc["@mozilla.org/download-manager-ui;1"].
|
|
||||||
getService(Ci.nsIDownloadManagerUI).show();
|
|
||||||
|
|
||||||
waitForExplicitFinish();
|
|
||||||
}
|
}
|
|
@ -49,7 +49,6 @@ XPCSHELL_TESTS = \
|
||||||
unit \
|
unit \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
DIRS += browser
|
|
||||||
DIRS += chrome
|
DIRS += chrome
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
|
@ -1,54 +0,0 @@
|
||||||
#
|
|
||||||
# ***** 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 Original Code is Mozilla code.
|
|
||||||
#
|
|
||||||
# The Initial Developer of the Original Code is
|
|
||||||
# Mozilla Corporation.
|
|
||||||
# Portions created by the Initial Developer are Copyright (C) 2008
|
|
||||||
# the Initial Developer. All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Contributor(s):
|
|
||||||
# Shawn Wilsher <me@shawnwilsher.com> (Original Author)
|
|
||||||
#
|
|
||||||
# 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 *****
|
|
||||||
|
|
||||||
DEPTH = ../../../../..
|
|
||||||
topsrcdir = @top_srcdir@
|
|
||||||
srcdir = @srcdir@
|
|
||||||
VPATH = @srcdir@
|
|
||||||
relativesrcdir = toolkit/mozapps/downloads/tests/browser
|
|
||||||
|
|
||||||
include $(DEPTH)/config/autoconf.mk
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
|
||||||
|
|
||||||
_BROWSER_FILES = \
|
|
||||||
browser_bug_406857.js \
|
|
||||||
browser_bug_412360.js \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
libs:: $(_BROWSER_FILES)
|
|
||||||
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
|
|
|
@ -61,6 +61,7 @@ _CHROME_FILES = \
|
||||||
test_select_all.xul \
|
test_select_all.xul \
|
||||||
test_space_key_pauses_resumes.xul \
|
test_space_key_pauses_resumes.xul \
|
||||||
test_ui_stays_open_on_alert_clickback.xul \
|
test_ui_stays_open_on_alert_clickback.xul \
|
||||||
|
test_bug_412360.xul \
|
||||||
test_bug_429247.xul \
|
test_bug_429247.xul \
|
||||||
utils.js \
|
utils.js \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<!--
|
||||||
/* ***** BEGIN LICENSE BLOCK *****
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
*
|
*
|
||||||
|
@ -34,30 +36,66 @@
|
||||||
*
|
*
|
||||||
* ***** END LICENSE BLOCK ***** */
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This tests bug 412360, which caused problems when trying to save javascript
|
||||||
|
* URIs. This is not an xpcshell unit test because it triggers an assertion,
|
||||||
|
* which causes xpcshell test cases to fail.
|
||||||
|
*/
|
||||||
|
-->
|
||||||
|
|
||||||
|
<window title="Download Manager Test"
|
||||||
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
|
onload="test();">
|
||||||
|
|
||||||
|
<script type="application/javascript"
|
||||||
|
src="chrome://mochikit/content/MochiKit/packed.js"/>
|
||||||
|
<script type="application/javascript"
|
||||||
|
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
|
||||||
|
<script type="application/javascript"
|
||||||
|
src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
|
||||||
|
|
||||||
|
<script type="application/javascript">
|
||||||
|
<![CDATA[
|
||||||
|
|
||||||
|
const Cc = Components.classes;
|
||||||
|
const Ci = Components.interfaces;
|
||||||
|
const Cr = Components.results;
|
||||||
|
|
||||||
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
|
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||||
|
|
||||||
let didFail = false;
|
let didFail = false;
|
||||||
var file;
|
var file;
|
||||||
|
|
||||||
|
let factory = {
|
||||||
|
createInstance: function(aOuter, aIid) {
|
||||||
|
if (aOuter != null)
|
||||||
|
throw Components.results.NS_ERROR_NO_AGGREGATION;
|
||||||
|
return promptService.QueryInterface(aIid);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let promptService = {
|
let promptService = {
|
||||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptService]),
|
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptService]),
|
||||||
alert: function() {
|
alert: function() {
|
||||||
ok(didFail, "javascript: uri failed and showed a message");
|
ok(didFail, "javascript: uri failed and showed a message");
|
||||||
file.remove(false);
|
file.remove(false);
|
||||||
finish();
|
|
||||||
|
// Unregister the factory so we do not leak
|
||||||
|
Components.manager.QueryInterface(Ci.nsIComponentRegistrar).
|
||||||
|
unregisterFactory(
|
||||||
|
Components.ID("{6cc9c9fe-bc0b-432b-a410-253ef8bcc699}"),
|
||||||
|
factory
|
||||||
|
);
|
||||||
|
|
||||||
|
SimpleTest.finish();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Components.manager.QueryInterface(Ci.nsIComponentRegistrar).
|
Components.manager.QueryInterface(Ci.nsIComponentRegistrar).
|
||||||
registerFactory(Components.ID("{6cc9c9fe-bc0b-432b-a410-253ef8bcc699}"),
|
registerFactory(Components.ID("{6cc9c9fe-bc0b-432b-a410-253ef8bcc699}"),
|
||||||
"PromptService", "@mozilla.org/embedcomp/prompt-service;1",
|
"PromptService", "@mozilla.org/embedcomp/prompt-service;1",
|
||||||
{
|
factory
|
||||||
createInstance: function(aOuter, aIid) {
|
);
|
||||||
if (aOuter != null)
|
|
||||||
throw Components.results.NS_ERROR_NO_AGGREGATION;
|
|
||||||
return promptService.QueryInterface(aIid);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
function test()
|
function test()
|
||||||
{
|
{
|
||||||
|
@ -69,9 +107,10 @@ function test()
|
||||||
db.executeSimpleSQL("DELETE FROM moz_downloads");
|
db.executeSimpleSQL("DELETE FROM moz_downloads");
|
||||||
|
|
||||||
let stmt = db.createStatement(
|
let stmt = db.createStatement(
|
||||||
"INSERT INTO moz_downloads (source, target, state) " +
|
"INSERT INTO moz_downloads (source, target, state, endTime) " +
|
||||||
"VALUES (?1, ?2, ?3)");
|
"VALUES (?1, ?2, ?3, ?4)");
|
||||||
|
|
||||||
|
try {
|
||||||
// Saving javascript URIs doesn't work
|
// Saving javascript URIs doesn't work
|
||||||
stmt.bindStringParameter(0, "javascript:5");
|
stmt.bindStringParameter(0, "javascript:5");
|
||||||
|
|
||||||
|
@ -86,9 +125,14 @@ function test()
|
||||||
// Start it as canceled
|
// Start it as canceled
|
||||||
stmt.bindInt32Parameter(2, dm.DOWNLOAD_CANCELED);
|
stmt.bindInt32Parameter(2, dm.DOWNLOAD_CANCELED);
|
||||||
|
|
||||||
|
stmt.bindInt32Parameter(3, Date.now() * 1000);
|
||||||
|
|
||||||
// Add it!
|
// Add it!
|
||||||
stmt.execute();
|
stmt.execute();
|
||||||
|
}
|
||||||
|
finally {
|
||||||
stmt.finalize();
|
stmt.finalize();
|
||||||
|
}
|
||||||
|
|
||||||
let listener = {
|
let listener = {
|
||||||
onDownloadStateChange: function(aState, aDownload)
|
onDownloadStateChange: function(aState, aDownload)
|
||||||
|
@ -112,32 +156,40 @@ function test()
|
||||||
let win = wm.getMostRecentWindow("Download:Manager");
|
let win = wm.getMostRecentWindow("Download:Manager");
|
||||||
if (win) win.close();
|
if (win) win.close();
|
||||||
|
|
||||||
// Start the test when the download manager window loads
|
|
||||||
let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
|
|
||||||
getService(Ci.nsIWindowWatcher);
|
|
||||||
ww.registerNotification({
|
|
||||||
observe: function(aSubject, aTopic, aData) {
|
|
||||||
ww.unregisterNotification(this);
|
|
||||||
aSubject.QueryInterface(Ci.nsIDOMEventTarget).
|
|
||||||
addEventListener("DOMContentLoaded", doTest, false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Let the Startup method of the download manager UI finish before we test
|
let os = Cc["@mozilla.org/observer-service;1"].
|
||||||
let doTest = function() setTimeout(function() {
|
getService(Ci.nsIObserverService);
|
||||||
win = wm.getMostRecentWindow("Download:Manager");
|
const DLMGR_UI_DONE = "download-manager-ui-done";
|
||||||
|
|
||||||
// Try again if selectedIndex is -1
|
let testObs = {
|
||||||
if (win.document.getElementById("downloadView").selectedIndex)
|
observe: function(aSubject, aTopic, aData)
|
||||||
return doTest();
|
{
|
||||||
|
if (aTopic != DLMGR_UI_DONE)
|
||||||
|
return;
|
||||||
|
|
||||||
|
let win = aSubject.QueryInterface(Ci.nsIDOMWindow);
|
||||||
// Send the enter key to Download Manager to retry the download
|
// Send the enter key to Download Manager to retry the download
|
||||||
EventUtils.synthesizeKey("VK_ENTER", {}, win);
|
synthesizeKey("VK_ENTER", {}, win);
|
||||||
}, 0);
|
os.removeObserver(testObs, DLMGR_UI_DONE);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Register with the observer service
|
||||||
|
os.addObserver(testObs, DLMGR_UI_DONE, false);
|
||||||
|
|
||||||
// Show the Download Manager UI
|
// Show the Download Manager UI
|
||||||
Cc["@mozilla.org/download-manager-ui;1"].
|
Cc["@mozilla.org/download-manager-ui;1"].
|
||||||
getService(Ci.nsIDownloadManagerUI).show();
|
getService(Ci.nsIDownloadManagerUI).show();
|
||||||
|
|
||||||
waitForExplicitFinish();
|
SimpleTest.waitForExplicitFinish();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
]]>
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
<p id="display"></p>
|
||||||
|
<div id="content" style="display:none;"></div>
|
||||||
|
<pre id="test"></pre>
|
||||||
|
</body>
|
||||||
|
</window>
|
Загрузка…
Ссылка в новой задаче