corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1966596 - Move common imports into the head file in toolkit/modules/tests/xpcshell. r=firefox-desktop-core-reviewers ,Gijs

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D249525
This commit is contained in:
Mark Banner
2025-05-16 17:53:26 +00:00
committed by mbanner@mozilla.com
parent 4f13d00f84
commit 2cee5a90d9
17 changed files with 4 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/modules/tests/xpcshell/head.js
View File

@@ -2,7 +2,11 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
ChromeUtils.defineESModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
Preferences: "resource://gre/modules/Preferences.sys.mjs",
Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
});
do_get_profile();

12
toolkit/modules/tests/xpcshell/test_BrowserUtils.js
View File

@@ -1,10 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const { BrowserUtils } = ChromeUtils.importESModule(
"resource://gre/modules/BrowserUtils.sys.mjs"
);
@@ -21,14 +17,6 @@ const { updateAppInfo } = ChromeUtils.importESModule(
"resource://testing-common/AppInfo.sys.mjs"
);
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
// Helper to run tests for specific regions
function setupRegions(home, current) {
Region._setHomeRegion(home || "");

4
toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js
View File

@@ -5,10 +5,6 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
do_get_profile();
const { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"
);
let tempFile = new FileUtils.File(PathUtils.tempDir);
const TEST_LOCAL_FILE_NAME = "hello.txt";
tempFile.append(TEST_LOCAL_FILE_NAME);

4
toolkit/modules/tests/xpcshell/test_FileUtils.js
View File

@@ -1,10 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"
);
function do_check_throws(f, result, stack) {
if (!stack) {
stack = Components.stack.caller;

9
toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
View File

@@ -11,15 +11,9 @@ const { GMPExtractor, GMPInstallManager } = ChromeUtils.importESModule(
const { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
const { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"
);
const { HttpServer } = ChromeUtils.importESModule(
"resource://testing-common/httpd.sys.mjs"
);
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
const { UpdateUtils } = ChromeUtils.importESModule(
"resource://gre/modules/UpdateUtils.sys.mjs"
);
@@ -29,9 +23,6 @@ const { GMPPrefs, OPEN_H264_ID } = ChromeUtils.importESModule(
const { ProductAddonCheckerTestUtils } = ChromeUtils.importESModule(
"resource://gre/modules/addons/ProductAddonChecker.sys.mjs"
);
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
Services.prefs.setBoolPref("media.gmp-manager.updateEnabled", true);

3
toolkit/modules/tests/xpcshell/test_LogManager.js
View File

@@ -10,9 +10,6 @@ const { LogManager } = ChromeUtils.importESModule(
const { Log } = ChromeUtils.importESModule(
"resource://gre/modules/Log.sys.mjs"
);
const { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"
);
const logManagerDefaultOptions = {
logFileSubDirectoryEntries: ["weave", "logs"],
testTopicPrefix: "services-tests:common:log-manager:",

4
toolkit/modules/tests/xpcshell/test_MatchURLFilters.js
View File

@@ -7,10 +7,6 @@ const { MatchURLFilters } = ChromeUtils.importESModule(
"resource://gre/modules/MatchURLFilters.sys.mjs"
);
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
function createTestFilter({ url, filters }) {
let m = new MatchURLFilters(filters);
return m.matches(url);

3
toolkit/modules/tests/xpcshell/test_NewTabUtils.js
View File

@@ -6,9 +6,6 @@
const { NewTabUtils } = ChromeUtils.importESModule(
"resource://gre/modules/NewTabUtils.sys.mjs"
);
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const { PlacesTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PlacesTestUtils.sys.mjs"
);

4
toolkit/modules/tests/xpcshell/test_Preferences.js
View File

@@ -1,10 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
add_test(function test_set_get_pref() {
Preferences.set("test_set_get_pref.integer", 1);
Assert.equal(Preferences.get("test_set_get_pref.integer"), 1);

3
toolkit/modules/tests/xpcshell/test_Region.js
View File

@@ -6,9 +6,6 @@ const { HttpServer } = ChromeUtils.importESModule(
const { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);

3
toolkit/modules/tests/xpcshell/test_Region_geocoding.js
View File

@@ -6,9 +6,6 @@ const { Region } = ChromeUtils.importESModule(
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
RegionTestUtils: "resource://testing-common/RegionTestUtils.sys.mjs",

3
toolkit/modules/tests/xpcshell/test_UpdateUtils_updatechannel.js
View File

@@ -3,9 +3,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
const { UpdateUtils } = ChromeUtils.importESModule(
"resource://gre/modules/UpdateUtils.sys.mjs"
);

3
toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
View File

@@ -6,9 +6,6 @@
const { UpdateUtils } = ChromeUtils.importESModule(
"resource://gre/modules/UpdateUtils.sys.mjs"
);
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const { getAppInfo, updateAppInfo } = ChromeUtils.importESModule(
"resource://testing-common/AppInfo.sys.mjs"
);

3
toolkit/modules/tests/xpcshell/test_firstStartup.js
View File

@@ -1,8 +1,5 @@
"use strict";
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const { FirstStartup } = ChromeUtils.importESModule(
"resource://gre/modules/FirstStartup.sys.mjs"
);

4
toolkit/modules/tests/xpcshell/test_osKeyStore.js
View File

@@ -4,10 +4,6 @@
"use strict";
var { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
let OSKeyStoreTestUtils;
add_task(async function os_key_store_setup() {
({ OSKeyStoreTestUtils } = ChromeUtils.importESModule(

6
toolkit/modules/tests/xpcshell/test_sqlite.js
View File

@@ -2,12 +2,6 @@
const PROFILE_DIR = do_get_profile().path;
const { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"
);
const { Sqlite } = ChromeUtils.importESModule(
"resource://gre/modules/Sqlite.sys.mjs"
);
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"
);

7
toolkit/modules/tests/xpcshell/test_sqlite_autoVacuum.js
View File

@@ -1,12 +1,5 @@
"use strict";
const { Sqlite } = ChromeUtils.importESModule(
"resource://gre/modules/Sqlite.sys.mjs"
);
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
/**
* Sends a fake idle-daily notification to the VACUUM Manager.
*/