Skip to content

Commit

Permalink
Bug 1799314 - Convert consumers of testing modules to import ES modul…
Browse files Browse the repository at this point in the history
…es direct (toolkit/). r=mossop,pip-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D161910
  • Loading branch information
Standard8 committed Nov 17, 2022
1 parent 93fa5ff commit 25dcc09
Show file tree
Hide file tree
Showing 77 changed files with 159 additions and 191 deletions.
4 changes: 2 additions & 2 deletions toolkit/components/antitracking/test/xpcshell/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
do_get_profile();

// Let's use XPCShellContentUtils to open/close tabs.
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);

XPCShellContentUtils.init(this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
// up a dummy app info. In the backgroundtask itself, the application under
// test will configure real app info. This opens a possibility for some
// incompatibility, but there doesn't appear to be such an issue at this time.
const { updateAppInfo } = ChromeUtils.import(
"resource://testing-common/AppInfo.jsm"
const { updateAppInfo } = ChromeUtils.importESModule(
"resource://testing-common/AppInfo.sys.mjs"
);
updateAppInfo({
name: "XPCShell",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

"use strict";

const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
const TEST_CERT_BASE64 =
"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";
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/cleardata/SiteDataTestUtils.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ var EXPORTED_SYMBOLS = ["SiteDataTestUtils"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
const { BrowserTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/BrowserTestUtils.sys.mjs"
);

const lazy = {};
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/cleardata/tests/unit/test_downloads.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
const { Downloads } = ChromeUtils.importESModule(
"resource://gre/modules/Downloads.sys.mjs"
);
const { FileTestUtils } = ChromeUtils.import(
"resource://testing-common/FileTestUtils.jsm"
const { FileTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/FileTestUtils.sys.mjs"
);

const TEST_TARGET_FILE_NAME = "test-download.txt";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
const { getCrashManagerNoCreate } = ChromeUtils.import(
"resource://gre/modules/CrashManager.jsm"
);
const { makeFakeAppDir } = ChromeUtils.import(
"resource://testing-common/AppData.jsm"
const { makeFakeAppDir } = ChromeUtils.importESModule(
"resource://testing-common/AppData.sys.mjs"
);

add_task(async function test_instantiation() {
Expand Down
6 changes: 3 additions & 3 deletions toolkit/components/downloads/test/unit/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ ChromeUtils.defineESModuleGetters(this, {
DownloadPaths: "resource://gre/modules/DownloadPaths.sys.mjs",
Downloads: "resource://gre/modules/Downloads.sys.mjs",
E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
FileTestUtils: "resource://testing-common/FileTestUtils.sys.mjs",
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
MockRegistrar: "resource://testing-common/MockRegistrar.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
});

XPCOMUtils.defineLazyModuleGetters(this, {
FileTestUtils: "resource://testing-common/FileTestUtils.jsm",
HttpServer: "resource://testing-common/httpd.js",
MockRegistrar: "resource://testing-common/MockRegistrar.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
OS: "resource://gre/modules/osfile.jsm",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
TestUtils: "resource://testing-common/TestUtils.jsm",
});

XPCOMUtils.defineLazyServiceGetter(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@

import { Preferences } from "resource://gre/modules/Preferences.sys.mjs";

const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
import { Assert } from "resource://testing-common/Assert.sys.mjs";

const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"FileTestUtils",
"resource://testing-common/FileTestUtils.jsm"
);
ChromeUtils.defineESModuleGetters(lazy, {
FileTestUtils: "resource://testing-common/FileTestUtils.sys.mjs",
});

export var EnterprisePolicyTesting = {
// |json| must be an object representing the desired policy configuration, OR a
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/enterprisepolicies/tests/browser/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ const {
} = ChromeUtils.importESModule(
"resource://testing-common/EnterprisePolicyTesting.sys.mjs"
);
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);

PoliciesPrefTracker.start();
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/enterprisepolicies/tests/xpcshell/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

"use strict";

const { updateAppInfo } = ChromeUtils.import(
"resource://testing-common/AppInfo.jsm"
const { updateAppInfo } = ChromeUtils.importESModule(
"resource://testing-common/AppInfo.sys.mjs"
);
const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
"resource://testing-common/EnterprisePolicyTesting.sys.mjs"
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/glean/tests/xpcshell/test_FOGIPCLimit.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);

const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);

add_setup(
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/glean/tests/xpcshell/test_GIFFTIPC.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
const { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
Expand Down
2 changes: 1 addition & 1 deletion toolkit/components/httpsonlyerror/content/errorpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@ function addAutofocus(selector, position = "afterbegin") {

initPage();
// Dispatch this event so tests can detect that we finished loading the error page.
// We're using the same event name as neterror because BrowserTestUtils.jsm relies on that.
// We're using the same event name as neterror because BrowserTestUtils.sys.mjs relies on that.
let event = new CustomEvent("AboutNetErrorLoad", { bubbles: true });
document.dispatchEvent(event);
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ ChromeUtils.defineModuleGetter(
"ASRouterTriggerListeners",
"resource://activity-stream/lib/ASRouterTriggerListeners.jsm"
);
ChromeUtils.defineModuleGetter(
this,
"TestUtils",
"resource://testing-common/TestUtils.jsm"
);
ChromeUtils.defineESModuleGetters(this, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
});

async function openURLInWindow(window, url) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const { TargetingContext } = ChromeUtils.import(
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
);
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);

add_task(async function instance_with_default() {
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/narrate/test/NarrateTestUtils.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
const { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/nimbus/test/NimbusTestUtils.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const { ExperimentStore } = ChromeUtils.import(
"resource://nimbus/lib/ExperimentStore.jsm"
);

const { FileTestUtils } = ChromeUtils.import(
"resource://testing-common/FileTestUtils.jsm"
const { FileTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/FileTestUtils.sys.mjs"
);

const lazy = {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ const { RemoteSettings } = ChromeUtils.import(
const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
"resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
);
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
);
const { ExperimentFakes } = ChromeUtils.import(
"resource://testing-common/NimbusTestUtils.jsm"
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ const { ExperimentManager } = ChromeUtils.import(
const { ExperimentAPI } = ChromeUtils.import(
"resource://nimbus/ExperimentAPI.jsm"
);
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
);

function getRecipe(slug) {
return ExperimentFakes.recipe(slug, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ const { ExperimentManager } = ChromeUtils.import(
const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
"resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
);
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
);
const { TelemetryEnvironment } = ChromeUtils.import(
"resource://gre/modules/TelemetryEnvironment.jsm"
);
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/nimbus/test/unit/test_ExperimentAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const { ExperimentAPI } = ChromeUtils.import(
const { ExperimentFakes } = ChromeUtils.import(
"resource://testing-common/NimbusTestUtils.jsm"
);
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
const COLLECTION_ID_PREF = "messaging-system.rsexperimentloader.collection_id";

Expand Down
8 changes: 4 additions & 4 deletions toolkit/components/nimbus/test/unit/test_SharedDataMap.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const { SharedDataMap } = ChromeUtils.import(
"resource://nimbus/lib/SharedDataMap.jsm"
);
const { FileTestUtils } = ChromeUtils.import(
"resource://testing-common/FileTestUtils.jsm"
const { FileTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/FileTestUtils.sys.mjs"
);
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);

const PATH = FileTestUtils.getTempFile("shared-data-map").path;
Expand Down
3 changes: 0 additions & 3 deletions toolkit/components/normandy/test/browser/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ const { Preferences } = ChromeUtils.importESModule(
const { AddonTestUtils } = ChromeUtils.import(
"resource://testing-common/AddonTestUtils.jsm"
);
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
);
const { AboutPages } = ChromeUtils.import(
"resource://normandy-content/AboutPages.jsm"
);
Expand Down
8 changes: 3 additions & 5 deletions toolkit/components/normandy/test/unit/test_Normandy.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ const { NormandyMigrations } = ChromeUtils.import(
const { PromiseUtils } = ChromeUtils.importESModule(
"resource://gre/modules/PromiseUtils.sys.mjs"
);
ChromeUtils.defineModuleGetter(
this,
"TestUtils",
"resource://testing-common/TestUtils.jsm"
);
ChromeUtils.defineESModuleGetters(this, {
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
});

/* import-globals-from utils.js */
load("utils.js");
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/normandy/test/unit/test_RecipeRunner.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/

const { updateAppInfo } = ChromeUtils.import(
"resource://testing-common/AppInfo.jsm"
const { updateAppInfo } = ChromeUtils.importESModule(
"resource://testing-common/AppInfo.sys.mjs"
);
const { RecipeRunner } = ChromeUtils.import(
"resource://normandy/lib/RecipeRunner.jsm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
const { makeFakeAppDir } = ChromeUtils.import(
"resource://testing-common/AppData.jsm"
const { makeFakeAppDir } = ChromeUtils.importESModule(
"resource://testing-common/AppData.sys.mjs"
);

function compare_paths(ospath, key) {
Expand Down
4 changes: 2 additions & 2 deletions toolkit/components/pdfjs/test/browser_pdfjs_fullscreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ add_task(async function test() {
const fullscreenPromise = waitForFullScreenState(browser, true);

await SpecialPowers.spawn(browser, [], async function() {
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
const EventUtils = ContentTaskUtils.getEventUtils(content);
await EventUtils.synthesizeKey(
Expand Down
12 changes: 6 additions & 6 deletions toolkit/components/pdfjs/test/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ async function waitForPdfJSAllLayers(browser, url, layers) {
await Promise.all([loadPromise, annotationPromise, annotationEditorPromise]);

await SpecialPowers.spawn(browser, [layers], async function(layers) {
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
const { document } = content;

Expand Down Expand Up @@ -140,8 +140,8 @@ async function enableEditor(browser, name) {
*/
async function getSpanBox(browser, text) {
return SpecialPowers.spawn(browser, [text], async function(text) {
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
const { document } = content;

Expand Down Expand Up @@ -252,8 +252,8 @@ async function focusEditorLayer(browser) {
*/
async function hitKey(browser, char) {
await SpecialPowers.spawn(browser, [char], async function(char) {
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
const EventUtils = ContentTaskUtils.getEventUtils(content);
await EventUtils.synthesizeKey(char, {}, content);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ add_task(async () => {
}

let newVideo = doc.createElement("video");
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
let ready = ContentTaskUtils.waitForEvent(newVideo, "canplay");
newVideo.src = "test-video.mp4";
Expand Down
6 changes: 1 addition & 5 deletions toolkit/components/places/tests/PlacesTestUtils.sys.mjs
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
"TestUtils",
"resource://testing-common/TestUtils.jsm"
);

export var PlacesTestUtils = Object.freeze({
/**
Expand Down
Loading

0 comments on commit 25dcc09

Please sign in to comment.