From 186ddd89f16b93573558f556c33288969f8e5a2c Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Mon, 1 Jun 2015 13:35:18 +0100 Subject: [PATCH] Bug 995697 - remove obsolete geolocation private browsing test, r=jdm --HG-- extra : commitid : 2OEugmfgclg extra : rebase_source : 0bdc19ed8ababfda0b4ee8639266e45509dc2b1a --- dom/tests/browser/browser.ini | 3 - ...wser_geolocation_privatebrowsing_page.html | 11 --- ...geolocation_privatebrowsing_perwindowpb.js | 90 ------------------- dom/tests/browser/network_geolocation.sjs | 45 ---------- 4 files changed, 149 deletions(-) delete mode 100644 dom/tests/browser/browser_geolocation_privatebrowsing_page.html delete mode 100644 dom/tests/browser/browser_geolocation_privatebrowsing_perwindowpb.js delete mode 100644 dom/tests/browser/network_geolocation.sjs diff --git a/dom/tests/browser/browser.ini b/dom/tests/browser/browser.ini index 1be9889af13e..3fc0938a8e0e 100644 --- a/dom/tests/browser/browser.ini +++ b/dom/tests/browser/browser.ini @@ -2,8 +2,6 @@ skip-if = e10s # Bug ?????? - most of these tests fail for currently unknown reasons. support-files = browser_frame_elements.html - browser_geolocation_privatebrowsing_page.html - network_geolocation.sjs page_privatestorageevent.html position.html test-console-api.html @@ -23,7 +21,6 @@ skip-if= buildapp == 'mulet' [browser_focus_steal_from_chrome.js] [browser_focus_steal_from_chrome_during_mousedown.js] [browser_frame_elements.js] -[browser_geolocation_privatebrowsing_perwindowpb.js] [browser_localStorage_privatestorageevent.js] [browser_test_new_window_from_content.js] skip-if = (toolkit == 'android' || buildapp == 'b2g' || buildapp == 'mulet') diff --git a/dom/tests/browser/browser_geolocation_privatebrowsing_page.html b/dom/tests/browser/browser_geolocation_privatebrowsing_page.html deleted file mode 100644 index 1b6e46155a1d..000000000000 --- a/dom/tests/browser/browser_geolocation_privatebrowsing_page.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/dom/tests/browser/browser_geolocation_privatebrowsing_perwindowpb.js b/dom/tests/browser/browser_geolocation_privatebrowsing_perwindowpb.js deleted file mode 100644 index c20665914a06..000000000000 --- a/dom/tests/browser/browser_geolocation_privatebrowsing_perwindowpb.js +++ /dev/null @@ -1,90 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ */ - -function test() { - var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch); - let baseProvider = "http://mochi.test:8888/browser/dom/tests/browser/network_geolocation.sjs"; - prefs.setCharPref("geo.wifi.uri", baseProvider + "?desired_access_token=fff"); - - prefs.setBoolPref("geo.prompt.testing", true); - prefs.setBoolPref("geo.prompt.testing.allow", true); - var origScanValue = true; // same default in NetworkGeolocationProvider.js. - try { - origScanValue = prefs.getBoolPref("geo.wifi.scan"); - } catch(ex) {} - prefs.setBoolPref("geo.wifi.scan", false); - - const testPageURL = "http://mochi.test:8888/browser/" + - "dom/tests/browser/browser_geolocation_privatebrowsing_page.html"; - waitForExplicitFinish(); - - var windowsToClose = []; - function testOnWindow(aIsPrivate, aCallback) { - let win = OpenBrowserWindow({private: aIsPrivate}); - let gotLoad = false; - let gotActivate = Services.focus.activeWindow == win; - - function maybeRunCallback() { - if (gotLoad && gotActivate) { - windowsToClose.push(win); - executeSoon(function() { aCallback(win); }); - } - } - - if (!gotActivate) { - win.addEventListener("activate", function onActivate() { - info("got activate"); - win.removeEventListener("activate", onActivate, true); - gotActivate = true; - maybeRunCallback(); - }, true); - } else { - info("Was activated"); - } - - Services.obs.addObserver(function observer(aSubject, aTopic) { - if (win == aSubject) { - info("Delayed startup finished"); - Services.obs.removeObserver(observer, aTopic); - gotLoad = true; - maybeRunCallback(); - } - }, "browser-delayed-startup-finished", false); - - } - - testOnWindow(false, function(aNormalWindow) { - aNormalWindow.gBrowser.selectedBrowser.addEventListener("georesult", function load(ev) { - aNormalWindow.gBrowser.selectedBrowser.removeEventListener("georesult", load, false); - is(ev.detail, 200, "unexpected access token"); - - prefs.setCharPref("geo.wifi.uri", baseProvider + "?desired_access_token=ggg"); - - testOnWindow(true, function(aPrivateWindow) { - aPrivateWindow.gBrowser.selectedBrowser.addEventListener("georesult", function load2(ev) { - aPrivateWindow.gBrowser.selectedBrowser.removeEventListener("georesult", load2, false); - is(ev.detail, 200, "unexpected access token"); - - prefs.setCharPref("geo.wifi.uri", baseProvider + "?expected_access_token=fff"); - - testOnWindow(false, function(aAnotherNormalWindow) { - aAnotherNormalWindow.gBrowser.selectedBrowser.addEventListener("georesult", function load3(ev) { - aAnotherNormalWindow.gBrowser.selectedBrowser.removeEventListener("georesult", load3, false); - is(ev.detail, 200, "unexpected access token"); - prefs.setBoolPref("geo.prompt.testing", false); - prefs.setBoolPref("geo.prompt.testing.allow", false); - prefs.setBoolPref("geo.wifi.scan", origScanValue); - windowsToClose.forEach(function(win) { - win.close(); - }); - finish(); - }, false, true); - aAnotherNormalWindow.content.location = testPageURL; - }); - }, false, true); - aPrivateWindow.content.location = testPageURL; - }); - }, false, true); - aNormalWindow.content.location = testPageURL; - }); -} diff --git a/dom/tests/browser/network_geolocation.sjs b/dom/tests/browser/network_geolocation.sjs deleted file mode 100644 index 5a914c63d468..000000000000 --- a/dom/tests/browser/network_geolocation.sjs +++ /dev/null @@ -1,45 +0,0 @@ -function parseQueryString(str) -{ - if (str == "") - return {}; - - var paramArray = str.split("&"); - var regex = /^([^=]+)=(.*)$/; - var params = {}; - for (var i = 0, sz = paramArray.length; i < sz; i++) - { - var match = regex.exec(paramArray[i]); - if (!match) - throw "Bad parameter in queryString! '" + paramArray[i] + "'"; - params[decodeURIComponent(match[1])] = decodeURIComponent(match[2]); - } - - return params; -} - -function getPosition(expectedAccessToken, providedAccessToken, desiredAccessToken) -{ - var response = { - status: "OK", - location: { - lat: providedAccessToken ? - (expectedAccessToken == providedAccessToken ? 200 : 404) : 200, - lng: -122.08769, - }, - accuracy: 100, - access_token: desiredAccessToken - }; - - return JSON.stringify(response); -} - -function handleRequest(request, response) -{ - var params = parseQueryString(request.queryString); - - response.setStatusLine("1.0", 200, "OK"); - response.setHeader("Cache-Control", "no-cache", false); - response.setHeader("Content-Type", "aplication/x-javascript", false); - response.write(getPosition(params.expected_access_token, params.access_token, - params.desired_access_token)); -}