mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Bug 1450943 - Remove unused helpers from devtools xpcshell tests. r=jdescottes
Differential Revision: https://phabricator.services.mozilla.com/D57994 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Alexandre Poirot
parent
92027b97b4
commit
4490636e24
@ -2,122 +2,15 @@
|
||||
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
"use strict";
|
||||
|
||||
const {
|
||||
LazyPool,
|
||||
createExtraActors,
|
||||
} = require("devtools/shared/protocol/lazy-pool");
|
||||
const { RootActor } = require("devtools/server/actors/root");
|
||||
const { ThreadActor } = require("devtools/server/actors/thread");
|
||||
const { DebuggerServer } = require("devtools/server/debugger-server");
|
||||
const {
|
||||
ActorRegistry,
|
||||
} = require("devtools/server/actors/utils/actor-registry");
|
||||
const promise = require("promise");
|
||||
|
||||
var gTestGlobals = [];
|
||||
DebuggerServer.addTestGlobal = function(global) {
|
||||
gTestGlobals.push(global);
|
||||
};
|
||||
|
||||
// A mock tab list, for use by tests. This simply presents each global in
|
||||
// gTestGlobals as a tab, and the list is fixed: it never calls its
|
||||
// onListChanged handler.
|
||||
//
|
||||
// As implemented now, we consult gTestGlobals when we're constructed, not
|
||||
// when we're iterated over, so tests have to add their globals before the
|
||||
// root actor is created.
|
||||
function TestTabList(connection) {
|
||||
this.conn = connection;
|
||||
|
||||
// An array of actors for each global added with
|
||||
// DebuggerServer.addTestGlobal.
|
||||
this._targetActors = [];
|
||||
|
||||
// A pool mapping those actors' names to the actors.
|
||||
this._targetActorPool = new LazyPool(connection);
|
||||
|
||||
for (const global of gTestGlobals) {
|
||||
const actor = new TestTargetActor(connection, global);
|
||||
actor.selected = false;
|
||||
this._targetActors.push(actor);
|
||||
this._targetActorPool.manage(actor);
|
||||
}
|
||||
if (this._targetActors.length > 0) {
|
||||
this._targetActors[0].selected = true;
|
||||
}
|
||||
}
|
||||
|
||||
TestTabList.prototype = {
|
||||
constructor: TestTabList,
|
||||
destroy() {},
|
||||
getList: function() {
|
||||
return promise.resolve([...this._targetActors]);
|
||||
},
|
||||
};
|
||||
|
||||
exports.createRootActor = function createRootActor(connection) {
|
||||
const root = new RootActor(connection, {
|
||||
tabList: new TestTabList(connection),
|
||||
globalActorFactories: ActorRegistry.globalActorFactories,
|
||||
});
|
||||
root.applicationType = "xpcshell-tests";
|
||||
return root;
|
||||
};
|
||||
|
||||
function TestTargetActor(connection, global) {
|
||||
this.conn = connection;
|
||||
this._global = global;
|
||||
this._threadActor = new ThreadActor(this, this._global);
|
||||
this.conn.addActor(this._threadActor);
|
||||
this._attached = false;
|
||||
this._extraActors = {};
|
||||
}
|
||||
|
||||
TestTargetActor.prototype = {
|
||||
constructor: TestTargetActor,
|
||||
actorPrefix: "TestTargetActor",
|
||||
|
||||
get window() {
|
||||
return { wrappedJSObject: this._global };
|
||||
},
|
||||
|
||||
get url() {
|
||||
return this._global.__name;
|
||||
},
|
||||
|
||||
form: function() {
|
||||
const response = { actor: this.actorID, title: this._global.__name };
|
||||
|
||||
// Walk over target-scoped actors and add them to a new LazyPool.
|
||||
const actorPool = new LazyPool(this.conn);
|
||||
const actors = createExtraActors(
|
||||
ActorRegistry.targetScopedActorFactories,
|
||||
actorPool,
|
||||
this
|
||||
);
|
||||
if (!actorPool.isEmpty()) {
|
||||
this._targetActorPool = actorPool;
|
||||
this.conn.addActorPool(this._targetActorPool);
|
||||
}
|
||||
|
||||
return { ...response, ...actors };
|
||||
},
|
||||
|
||||
onAttach: function(request) {
|
||||
this._attached = true;
|
||||
|
||||
return { type: "tabAttached", threadActor: this._threadActor.actorID };
|
||||
},
|
||||
|
||||
onDetach: function(request) {
|
||||
if (!this._attached) {
|
||||
return { error: "wrongState" };
|
||||
}
|
||||
return { type: "detached" };
|
||||
},
|
||||
};
|
||||
|
||||
TestTargetActor.prototype.requestTypes = {
|
||||
attach: TestTargetActor.prototype.onAttach,
|
||||
detach: TestTargetActor.prototype.onDetach,
|
||||
};
|
||||
|
||||
@ -2,120 +2,15 @@
|
||||
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
"use strict";
|
||||
|
||||
const {
|
||||
LazyPool,
|
||||
createExtraActors,
|
||||
} = require("devtools/shared/protocol/lazy-pool");
|
||||
const { RootActor } = require("devtools/server/actors/root");
|
||||
const { ThreadActor } = require("devtools/server/actors/thread");
|
||||
const { DebuggerServer } = require("devtools/server/debugger-server");
|
||||
const {
|
||||
ActorRegistry,
|
||||
} = require("devtools/server/actors/utils/actor-registry");
|
||||
|
||||
var gTestGlobals = [];
|
||||
DebuggerServer.addTestGlobal = function(global) {
|
||||
gTestGlobals.push(global);
|
||||
};
|
||||
|
||||
// A mock tab list, for use by tests. This simply presents each global in
|
||||
// gTestGlobals as a tab, and the list is fixed: it never calls its
|
||||
// onListChanged handler.
|
||||
//
|
||||
// As implemented now, we consult gTestGlobals when we're constructed, not
|
||||
// when we're iterated over, so tests have to add their globals before the
|
||||
// root actor is created.
|
||||
function TestTabList(connection) {
|
||||
this.conn = connection;
|
||||
|
||||
// An array of actors for each global added with
|
||||
// DebuggerServer.addTestGlobal.
|
||||
this._targetActors = [];
|
||||
|
||||
// A pool mapping those actors' names to the actors.
|
||||
this._targetActorPool = new LazyPool(connection);
|
||||
|
||||
for (const global of gTestGlobals) {
|
||||
const actor = new TestTargetActor(connection, global);
|
||||
actor.selected = false;
|
||||
this._targetActors.push(actor);
|
||||
this._targetActorPool.manage(actor);
|
||||
}
|
||||
if (this._targetActors.length > 0) {
|
||||
this._targetActors[0].selected = true;
|
||||
}
|
||||
}
|
||||
|
||||
TestTabList.prototype = {
|
||||
constructor: TestTabList,
|
||||
destroy() {},
|
||||
getList: function() {
|
||||
return Promise.resolve([...this._targetActors]);
|
||||
},
|
||||
};
|
||||
|
||||
exports.createRootActor = function createRootActor(connection) {
|
||||
const root = new RootActor(connection, {
|
||||
tabList: new TestTabList(connection),
|
||||
globalActorFactories: ActorRegistry.globalActorFactories,
|
||||
});
|
||||
root.applicationType = "xpcshell-tests";
|
||||
return root;
|
||||
};
|
||||
|
||||
function TestTargetActor(connection, global) {
|
||||
this.conn = connection;
|
||||
this._global = global;
|
||||
this._threadActor = new ThreadActor(this, this._global);
|
||||
this.conn.addActor(this._threadActor);
|
||||
this._attached = false;
|
||||
this._extraActors = {};
|
||||
}
|
||||
|
||||
TestTargetActor.prototype = {
|
||||
constructor: TestTargetActor,
|
||||
actorPrefix: "TestTargetActor",
|
||||
|
||||
get window() {
|
||||
return { wrappedJSObject: this._global };
|
||||
},
|
||||
|
||||
get url() {
|
||||
return this._global.__name;
|
||||
},
|
||||
|
||||
form: function() {
|
||||
const response = { actor: this.actorID, title: this._global.__name };
|
||||
|
||||
// Walk over target-scoped actors and add them to a new LazyPool.
|
||||
const actorPool = new LazyPool(this.conn);
|
||||
const actors = createExtraActors(
|
||||
ActorRegistry.targetScopedActorFactories,
|
||||
actorPool,
|
||||
this
|
||||
);
|
||||
if (!actorPool.isEmpty()) {
|
||||
this._targetActorPool = actorPool;
|
||||
}
|
||||
|
||||
return { ...response, ...actors };
|
||||
},
|
||||
|
||||
onAttach: function(request) {
|
||||
this._attached = true;
|
||||
|
||||
return { type: "tabAttached", threadActor: this._threadActor.actorID };
|
||||
},
|
||||
|
||||
onDetach: function(request) {
|
||||
if (!this._attached) {
|
||||
return { error: "wrongState" };
|
||||
}
|
||||
return { type: "detached" };
|
||||
},
|
||||
};
|
||||
|
||||
TestTargetActor.prototype.requestTypes = {
|
||||
attach: TestTargetActor.prototype.onAttach,
|
||||
detach: TestTargetActor.prototype.onDetach,
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user