Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 01adc20ea792 because of intermittent failures

Browse Source
This commit is contained in:
Dão Gottwald 2009-11-14 23:51:13 +01:00
parent 6f53c0f130
commit 90e1e68652
1 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
browser/components/sessionstore/test/browser/browser_526613.js
View File

@ -35,21 +35,6 @@
*
* ***** END LICENSE BLOCK ***** */
function waitForBrowserState(aState, aSetStateCallback) {
let os = Cc["@mozilla.org/observer-service;1"].
getService(Ci.nsIObserverService);
let observer = {
observe: function(aSubject, aTopic, aData) {
os.removeObserver(this, "sessionstore-browser-state-restored");
executeSoon(aSetStateCallback);
}
};
os.addObserver(observer, "sessionstore-browser-state-restored", false);
let ss = Cc["@mozilla.org/browser/sessionstore;1"].
getService(Ci.nsISessionStore);
ss.setBrowserState(JSON.stringify(aState));
}
function test() {
/** Test for Bug 526613 **/
@ -75,14 +60,8 @@ function test() {
is(browserWindowsCount(), 1, "Only one browser window should be open initially");
let blankState = {
windows: [{
tabs: [{ entries: [{ url: "about:blank" }] }],
_closedTabs: []
}],
_closedWindows: []
};
// backup old state
let oldState = ss.getBrowserState();
// create a new state for testing
let testState = {
windows: [
@ -94,24 +73,37 @@ function test() {
selectedWindow: 1
};
waitForBrowserState(testState, function() {
is(browserWindowsCount(), 2, "Two windows should exist at this point");
let observer = {
pass: 1,
observe: function(aSubject, aTopic, aData) {
is(aTopic, "sessionstore-browser-state-restored",
"The sessionstore-browser-state-restored notification was observed");
// let the first window be focused (see above)
function pollMostRecentWindow() {
if (wm.getMostRecentWindow("navigator:browser") == window) {
waitForBrowserState(blankState, function() {
is(browserWindowsCount(), 1, "Only one window should exist after cleanup");
ok(!window.closed, "Restoring the old state should have left this window open");
finish();
});
if (this.pass++ == 1) {
is(browserWindowsCount(), 2, "Two windows should exist at this point");
// let the first window be focused (see above)
function pollMostRecentWindow() {
if (wm.getMostRecentWindow("navigator:browser") == window) {
ss.setBrowserState(oldState);
} else {
info("waiting for the current window to become active");
setTimeout(pollMostRecentWindow, 0);
}
}
window.focus(); //XXX Why is this needed?
pollMostRecentWindow();
}
else {
info("waiting for the current window to become active");
setTimeout(pollMostRecentWindow, 0);
is(browserWindowsCount(), 1, "Only one window should exist after cleanup");
ok(!window.closed, "Restoring the old state should have left this window open");
os.removeObserver(this, "sessionstore-browser-state-restored");
finish();
}
}
window.focus(); //XXX Why is this needed?
pollMostRecentWindow();
});
};
os.addObserver(observer, "sessionstore-browser-state-restored", false);
// set browser to test state
ss.setBrowserState(JSON.stringify(testState));
}