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

Bug 1936092 - Part 11: Remove tests for Cu.loadedJSModules. r=Standard8,mccr8

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D233376
This commit is contained in:
Tooru Fujisawa
2025-01-22 04:38:30 +00:00
parent 71f43c128f
commit c77d92efff
6 changed files with 5 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
browser/base/content/test/performance/StartupContentSubframe.sys.mjs
View File

@@ -32,9 +32,6 @@ export class StartupContentSubframeChild extends JSWindowActorChild {
let collectStacks = AppConstants.NIGHTLY_BUILD || AppConstants.DEBUG;
let modules = new Map();
for (let module of Cu.loadedJSModules) {
modules.set(module, collectStacks ? Cu.getModuleImportStack(module) : "");
}
for (let module of Cu.loadedESModules) {
modules.set(module, collectStacks ? Cu.getModuleImportStack(module) : "");
}

6
browser/base/content/test/performance/browser_startup_content.js
View File

@@ -125,12 +125,6 @@ add_task(async function () {
);
let collectStacks = AppConstants.NIGHTLY_BUILD || AppConstants.DEBUG;
let modules = new Map();
for (let module of Cu.loadedJSModules) {
modules.set(
module,
collectStacks ? Cu.getModuleImportStack(module) : ""
);
}
for (let module of Cu.loadedESModules) {
modules.set(
module,

2
browser/components/StartupRecorder.sys.mjs
View File

@@ -105,7 +105,7 @@ StartupRecorder.prototype = {
name
);
this.data.code[name] = {
modules: Cu.loadedJSModules.concat(Cu.loadedESModules),
modules: Cu.loadedESModules,
services: Object.keys(Cc).filter(c => {
try {
return Cm.isServiceInstantiatedByContractID(c, Ci.nsISupports);

88
js/xpconnect/tests/unit/test_loadedESModules.js
View File

@@ -1,78 +1,8 @@
add_task(function test_JSModule() {
const URL1 = "resource://test/jsm_loaded-1.jsm";
const URL2 = "resource://test/jsm_loaded-2.jsm";
const URL3 = "resource://test/jsm_loaded-3.jsm";
Assert.ok(!Cu.loadedJSModules.includes(URL1));
Assert.ok(!Cu.isJSModuleLoaded(URL1));
Assert.ok(!Cu.loadedJSModules.includes(URL2));
Assert.ok(!Cu.isJSModuleLoaded(URL2));
Assert.ok(!Cu.loadedJSModules.includes(URL3));
Assert.ok(!Cu.isJSModuleLoaded(URL3));
Assert.ok(!Cu.loadedESModules.includes(URL1));
Assert.ok(!Cu.isESModuleLoaded(URL1));
Assert.ok(!Cu.loadedESModules.includes(URL2));
Assert.ok(!Cu.isESModuleLoaded(URL2));
Assert.ok(!Cu.loadedESModules.includes(URL3));
Assert.ok(!Cu.isESModuleLoaded(URL3));
ChromeUtils.import(URL1);
Assert.ok(Cu.loadedJSModules.includes(URL1));
Assert.ok(Cu.isJSModuleLoaded(URL1));
Assert.ok(!Cu.loadedJSModules.includes(URL2));
Assert.ok(!Cu.isJSModuleLoaded(URL2));
Assert.ok(!Cu.loadedJSModules.includes(URL3));
Assert.ok(!Cu.isJSModuleLoaded(URL3));
Assert.ok(!Cu.loadedESModules.includes(URL1));
Assert.ok(!Cu.isESModuleLoaded(URL1));
Assert.ok(!Cu.loadedESModules.includes(URL2));
Assert.ok(!Cu.isESModuleLoaded(URL2));
Assert.ok(!Cu.loadedESModules.includes(URL3));
Assert.ok(!Cu.isESModuleLoaded(URL3));
ChromeUtils.import(URL2);
Assert.ok(Cu.loadedJSModules.includes(URL1));
Assert.ok(Cu.isJSModuleLoaded(URL1));
Assert.ok(Cu.loadedJSModules.includes(URL2));
Assert.ok(Cu.isJSModuleLoaded(URL2));
Assert.ok(!Cu.loadedJSModules.includes(URL3));
Assert.ok(!Cu.isJSModuleLoaded(URL3));
Assert.ok(!Cu.loadedESModules.includes(URL1));
Assert.ok(!Cu.isESModuleLoaded(URL1));
Assert.ok(!Cu.loadedESModules.includes(URL2));
Assert.ok(!Cu.isESModuleLoaded(URL2));
Assert.ok(!Cu.loadedESModules.includes(URL3));
Assert.ok(!Cu.isESModuleLoaded(URL3));
ChromeUtils.import(URL3);
Assert.ok(Cu.loadedJSModules.includes(URL1));
Assert.ok(Cu.isJSModuleLoaded(URL1));
Assert.ok(Cu.loadedJSModules.includes(URL2));
Assert.ok(Cu.isJSModuleLoaded(URL2));
Assert.ok(Cu.loadedJSModules.includes(URL3));
Assert.ok(Cu.isJSModuleLoaded(URL3));
Assert.ok(!Cu.loadedESModules.includes(URL1));
Assert.ok(!Cu.isESModuleLoaded(URL1));
Assert.ok(!Cu.loadedESModules.includes(URL2));
Assert.ok(!Cu.isESModuleLoaded(URL2));
Assert.ok(!Cu.loadedESModules.includes(URL3));
Assert.ok(!Cu.isESModuleLoaded(URL3));
});
add_task(function test_ESModule() {
const URL1 = "resource://test/es6module_loaded-1.sys.mjs";
const URL2 = "resource://test/es6module_loaded-2.sys.mjs";
const URL3 = "resource://test/es6module_loaded-3.sys.mjs";
Assert.ok(!Cu.loadedJSModules.includes(URL1));
Assert.ok(!Cu.isJSModuleLoaded(URL1));
Assert.ok(!Cu.loadedJSModules.includes(URL2));
Assert.ok(!Cu.isJSModuleLoaded(URL2));
Assert.ok(!Cu.loadedJSModules.includes(URL3));
Assert.ok(!Cu.isJSModuleLoaded(URL3));
Assert.ok(!Cu.loadedESModules.includes(URL1));
Assert.ok(!Cu.isESModuleLoaded(URL1));
Assert.ok(!Cu.loadedESModules.includes(URL2));
@@ -82,12 +12,6 @@ add_task(function test_ESModule() {
ChromeUtils.importESModule(URL1);
Assert.ok(!Cu.loadedJSModules.includes(URL1));
Assert.ok(!Cu.isJSModuleLoaded(URL1));
Assert.ok(!Cu.loadedJSModules.includes(URL2));
Assert.ok(!Cu.isJSModuleLoaded(URL2));
Assert.ok(!Cu.loadedJSModules.includes(URL3));
Assert.ok(!Cu.isJSModuleLoaded(URL3));
Assert.ok(Cu.loadedESModules.includes(URL1));
Assert.ok(Cu.isESModuleLoaded(URL1));
Assert.ok(!Cu.loadedESModules.includes(URL2));
@@ -97,12 +21,6 @@ add_task(function test_ESModule() {
ChromeUtils.importESModule(URL2);
Assert.ok(!Cu.loadedJSModules.includes(URL1));
Assert.ok(!Cu.isJSModuleLoaded(URL1));
Assert.ok(!Cu.loadedJSModules.includes(URL2));
Assert.ok(!Cu.isJSModuleLoaded(URL2));
Assert.ok(!Cu.loadedJSModules.includes(URL3));
Assert.ok(!Cu.isJSModuleLoaded(URL3));
Assert.ok(Cu.loadedESModules.includes(URL1));
Assert.ok(Cu.isESModuleLoaded(URL1));
Assert.ok(Cu.loadedESModules.includes(URL2));
@@ -112,12 +30,6 @@ add_task(function test_ESModule() {
ChromeUtils.importESModule(URL3);
Assert.ok(!Cu.loadedJSModules.includes(URL1));
Assert.ok(!Cu.isJSModuleLoaded(URL1));
Assert.ok(!Cu.loadedJSModules.includes(URL2));
Assert.ok(!Cu.isJSModuleLoaded(URL2));
Assert.ok(!Cu.loadedJSModules.includes(URL3));
Assert.ok(!Cu.isJSModuleLoaded(URL3));
Assert.ok(Cu.loadedESModules.includes(URL1));
Assert.ok(Cu.isESModuleLoaded(URL1));
Assert.ok(Cu.loadedESModules.includes(URL2));

2
toolkit/components/backgroundtasks/tests/browser/browser_xpcom_graph_wait.js
View File

@@ -200,7 +200,7 @@ add_task(async function test_xpcom_graph_wait() {
function newMarkers() {
return {
// The equivalent of `Cu.loadedJSModules` + `Cu.loadedESModules`.
// The equivalent of `Cu.loadedESModules`.
modules: [],
services: [],
};

6
toolkit/components/extensions/test/xpcshell/test_ext_startup_perf.js
View File

@@ -58,9 +58,9 @@ add_task(async function test_loaded_scripts() {
"No extra APIs should be loaded at startup for a simple extension"
);
let loadedModules = Cu.loadedJSModules
.concat(Cu.loadedESModules)
.filter(url => url.startsWith("resource://gre/modules/Extension"));
let loadedModules = Cu.loadedESModules.filter(url =>
url.startsWith("resource://gre/modules/Extension")
);
deepEqual(
loadedModules.sort(),