Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 12:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1241930: Part 1 - make all Assert.jsm assert methods available for use in ContentTasks. r=mconley

Browse Source
This commit is contained in:
Mike de Boer 2016-03-04 14:32:22 +01:00
parent 6e681479dc
commit 03bd1469f2
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/mochitest/BrowserTestUtils/ContentTask.jsm
View File

@ -114,7 +114,7 @@ var ContentMessageListener = {
}
} else if (aMessage.name == "content-task:test-result") {
let data = aMessage.data;
ContentTask._testScope.ok(data.condition, data.name, data.diag, data.stack);
ContentTask._testScope.ok(data.condition, data.name, null, data.stack);
} else if (aMessage.name == "content-task:test-info") {
ContentTask._testScope.info(aMessage.data.name);
}

21
testing/mochitest/BrowserTestUtils/content/content-task.js
View File

@ -8,6 +8,7 @@ var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
Cu.import("resource://gre/modules/Task.jsm", this);
Cu.import("resource://testing-common/ContentTaskUtils.jsm", this);
const AssertCls = Cu.import("resource://testing-common/Assert.jsm", null).Assert;
addMessageListener("content-task:spawn", function (msg) {
let id = msg.data.id;
@ -21,20 +22,18 @@ addMessageListener("content-task:spawn", function (msg) {
return frames.join("\n");
}
function ok(condition, name, diag) {
let stack = getStack(Components.stack.caller);
var Assert = new AssertCls((err, message, stack) => {
sendAsyncMessage("content-task:test-result", {
id, condition: !!condition, name, diag, stack
id: id,
condition: !err,
name: err ? err.message : message,
stack: getStack(err ? err.stack : stack)
});
}
});
function is(a, b, name) {
ok(Object.is(a, b), name, "Got " + a + ", expected " + b);
}
function isnot(a, b, name) {
ok(!Object.is(a, b), name, "Didn't expect " + a + ", but got it");
}
var ok = Assert.ok.bind(Assert);
var is = Assert.equal.bind(Assert);
var isnot = Assert.notEqual.bind(Assert);
function info(name) {
sendAsyncMessage("content-task:test-info", {id, name});