diff options
author | Matěj Cepl <mcepl@redhat.com> | 2011-03-23 20:18:23 +0100 |
---|---|---|
committer | Matěj Cepl <mcepl@redhat.com> | 2011-03-23 20:18:23 +0100 |
commit | 2e5993bc9bd0d468f4e9d12dd39e0548ba9adda1 (patch) | |
tree | f31a0d612efbfa5beb78e4718768c55c650f14d8 /tests | |
parent | c662ccddab2cbcc6d13f49a21c04a6aea808f457 (diff) | |
download | bugzilla-triage-2e5993bc9bd0d468f4e9d12dd39e0548ba9adda1.tar.gz |
Fix indentation and else for Mozilla coding guidelines.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/pagemod-test-helpers.js | 35 | ||||
-rw-r--r-- | tests/test-color.js | 28 | ||||
-rw-r--r-- | tests/test-match-pattern.js | 14 | ||||
-rw-r--r-- | tests/test-pageMod.js | 74 | ||||
-rw-r--r-- | tests/test-util.js | 254 | ||||
-rw-r--r-- | tests/test-xmlrpc.js | 46 |
6 files changed, 226 insertions, 225 deletions
diff --git a/tests/pagemod-test-helpers.js b/tests/pagemod-test-helpers.js index b019810..8621421 100644 --- a/tests/pagemod-test-helpers.js +++ b/tests/pagemod-test-helpers.js @@ -7,27 +7,28 @@ const {Cc,Ci} = require("chrome"); * and checks the effect of the page mod on 'onload' event via testCallback. */ exports.testPageMod = function testPageMod(test, testURL, pageModOptions, - testCallback, timeout) { + testCallback, timeout) { var xulApp = require("xul-app"); if (!xulApp.versionInRange(xulApp.platformVersion, "1.9.3a3", "*") && - !xulApp.versionInRange(xulApp.platformVersion, "1.9.2.7", "1.9.2.*")) { - test.pass("Note: not testing PageMod, as it doesn't work on this platform version"); - return null; + !xulApp.versionInRange(xulApp.platformVersion, "1.9.2.7", "1.9.2.*")) { + test.pass("Note: not testing PageMod, as it doesn't work on this platform version"); + return null; } var wm = Cc['@mozilla.org/appshell/window-mediator;1'] - .getService(Ci.nsIWindowMediator); + .getService(Ci.nsIWindowMediator); var browserWindow = wm.getMostRecentWindow("navigator:browser"); if (!browserWindow) { - test.pass("page-mod tests: could not find the browser window, so " + - "will not run. Use -a firefox to run the pagemod tests.") - return null; + test.pass("page-mod tests: could not find the browser window, so " + + "will not run. Use -a firefox to run the pagemod tests.") + return null; } if (timeout !== undefined) { test.waitUntilDone(timeout); - } else { - test.waitUntilDone(); + } + else { + test.waitUntilDone(); } let loader = test.makeSandboxedLoader(); @@ -41,13 +42,13 @@ exports.testPageMod = function testPageMod(test, testURL, pageModOptions, var b = tabBrowser.getBrowserForTab(newTab); function onPageLoad() { - b.removeEventListener("load", onPageLoad, true); - testCallback(b.contentWindow.wrappedJSObject, function done() { - pageMods.forEach(function(mod) mod.destroy()); - // XXX leaks reported if we don't close the tab? - tabBrowser.removeTab(newTab); - test.done(); - }); + b.removeEventListener("load", onPageLoad, true); + testCallback(b.contentWindow.wrappedJSObject, function done() { + pageMods.forEach(function(mod) mod.destroy()); + // XXX leaks reported if we don't close the tab? + tabBrowser.removeTab(newTab); + test.done(); + }); } b.addEventListener("load", onPageLoad, true); diff --git a/tests/test-color.js b/tests/test-color.js index 2006fd9..eefb97d 100644 --- a/tests/test-color.js +++ b/tests/test-color.js @@ -5,27 +5,27 @@ // testing Color object var ensureColorNew = function (test) { - var col = new util.Color(255, 255, 166); - test.assertEqual(col.toString(), "#ffffa6", - "creation of new RGB Color object"); + var col = new util.Color(255, 255, 166); + test.assertEqual(col.toString(), "#ffffa6", + "creation of new RGB Color object"); }; var ensureColorUpdate = function (test) { - var col = new util.Color(255, 255, 166); - col.update(255, 224, 176); - test.assertEqual(col.toString(), "#ffe0b0", - "updating Color object"); + var col = new util.Color(255, 255, 166); + col.update(255, 224, 176); + test.assertEqual(col.toString(), "#ffe0b0", + "updating Color object"); }; var ensureColorHSL = function (test) { - var col = new util.Color(255, 224, 176); - test.assertEqual(col.hsl().toSource(), - "[0.10126582278481013, 1, 0.8450980392156863]", - "converting to HSL model"); + var col = new util.Color(255, 224, 176); + test.assertEqual(col.hsl().toSource(), + "[0.10126582278481013, 1, 0.8450980392156863]", + "converting to HSL model"); }; var ensureColorLight = function (test) { - var col = new util.Color(255, 224, 176); - test.assertEqual(col.lightColor().toString(), "#e8dcc9", - "getting a light color"); + var col = new util.Color(255, 224, 176); + test.assertEqual(col.lightColor().toString(), "#e8dcc9", + "getting a light color"); }; diff --git a/tests/test-match-pattern.js b/tests/test-match-pattern.js index ed51b43..9e3d2bd 100644 --- a/tests/test-match-pattern.js +++ b/tests/test-match-pattern.js @@ -1,11 +1,11 @@ var { MatchPattern } = require("match-pattern"); exports.ensureMatchPattern = function (test) { - var pattern = new MatchPattern("https://bugzilla.redhat.com/attachment.cgi"); - console.log("pattern = " + pattern); - test.assert(pattern. - test("https://bugzilla.redhat.com/attachment.cgi"), "testing match pattern"); - test.assert(!pattern. - test("https://bugzilla.redhat.com/attachment.cgi?bugid=676538&action=enter"), - "testing failing match pattern"); + var pattern = new MatchPattern("https://bugzilla.redhat.com/attachment.cgi"); + console.log("pattern = " + pattern); + test.assert(pattern. + test("https://bugzilla.redhat.com/attachment.cgi"), "testing match pattern"); + test.assert(!pattern. + test("https://bugzilla.redhat.com/attachment.cgi?bugid=676538&action=enter"), + "testing failing match pattern"); }; diff --git a/tests/test-pageMod.js b/tests/test-pageMod.js index 8662a4c..5434bbd 100644 --- a/tests/test-pageMod.js +++ b/tests/test-pageMod.js @@ -13,15 +13,15 @@ var testURL = self.data.url('tests/change-more-bugs01.html'); var JSONifiedMessage = '{"cmd":"testMessage","data":{"a":"first","b":"second"}}'; exports.ensureMessagesWork = function(test) { - var msg = new utilMod.Message("testMessage", { a: "first", b: "second" } ); - test.assertEqual(msg.cmd, "testMessage", - "msg.cmd comes over well"); - test.assertEqual(msg.data.a, "first", - "msg.data.a comes over well"); - test.assertEqual(msg.data.b, "second", - "msg.data.b comes over well"); - test.assertEqual(JSON.stringify(msg), JSONifiedMessage, - "JSONification of Message works as well"); + var msg = new utilMod.Message("testMessage", { a: "first", b: "second" } ); + test.assertEqual(msg.cmd, "testMessage", + "msg.cmd comes over well"); + test.assertEqual(msg.data.a, "first", + "msg.data.a comes over well"); + test.assertEqual(msg.data.b, "second", + "msg.data.b comes over well"); + test.assertEqual(JSON.stringify(msg), JSONifiedMessage, + "JSONification of Message works as well"); }; /* @@ -30,36 +30,36 @@ var theURL = main.theURL; var testURL = self.data.url('tests/change-more-bugs01.html'); var contentScriptLibraries = { - "bugzilla.redhat.com": [ - self.data.url("util.js"), - self.data.url("color.js"), - self.data.url("rhbzpage.js"), - self.data.url("bzpage.js") - ] + "bugzilla.redhat.com": [ + self.data.url("util.js"), + self.data.url("color.js"), + self.data.url("rhbzpage.js"), + self.data.url("bzpage.js") + ] }; libbz.initialize(libbz.config, function () { - pageMod.PageMod({ - include: [ - "https://bugzilla.redhat.com/show_bug.cgi?id=*" - ], - contentScriptWhen: 'ready', - contentScriptFile: contentScriptLibraries["bugzilla.redhat.com"], - onAttach: function onAttach(worker, msg) { - console.log("worker: " + worker); - worker.on('message', function (msg) { - messageHandler(worker, msg); - }); - } - }); -}); - -pageMod.PageMod({ + pageMod.PageMod({ include: [ - "https://bugzilla.redhat.com/process_bug.cgi" + "https://bugzilla.redhat.com/show_bug.cgi?id=*" ], contentScriptWhen: 'ready', - contentScriptFile: self.data.url("skip-bug.js") + contentScriptFile: contentScriptLibraries["bugzilla.redhat.com"], + onAttach: function onAttach(worker, msg) { + console.log("worker: " + worker); + worker.on('message', function (msg) { + messageHandler(worker, msg); + }); + } + }); +}); + +pageMod.PageMod({ + include: [ + "https://bugzilla.redhat.com/process_bug.cgi" + ], + contentScriptWhen: 'ready', + contentScriptFile: self.data.url("skip-bug.js") }); */ @@ -96,12 +96,12 @@ var ensureSimplePageLoad = function (test) { var ensurePageLoadsWell = function (test) { var wm = Cc['@mozilla.org/appshell/window-mediator;1'] - .getService(Ci.nsIWindowMediator); + .getService(Ci.nsIWindowMediator); var browserWindow = wm.getMostRecentWindow("navigator:browser"); if (!browserWindow) { - test.fail("page-mod tests: could not find the browser window, so " + - "will not run. Use -a firefox to run the pagemod tests."); - return null; + test.fail("page-mod tests: could not find the browser window, so " + + "will not run. Use -a firefox to run the pagemod tests."); + return null; } var loader = test.makeSandboxedLoader(); diff --git a/tests/test-util.js b/tests/test-util.js index d4e4a78..26c5f6d 100644 --- a/tests/test-util.js +++ b/tests/test-util.js @@ -7,208 +7,208 @@ var urlMod = require("url"); // testing util.heir var ensureHeir = function (test) { - var fedlimid = {}, naoise = {}; - - function Father(x) { - this.family = x; - } - - Father.prototype.getFamily = function getFamily() { - return this.family; - }; - - function Son(x, w) { - Father.call(this, x); - this.wife = w; - } - - Son.prototype = util.heir(Father); - Son.prototype.constructor = Son; - - Son.prototype.getWife = function getWife() { - return this.wife; - }; + var fedlimid = {}, naoise = {}; + + function Father(x) { + this.family = x; + } + + Father.prototype.getFamily = function getFamily() { + return this.family; + }; + + function Son(x, w) { + Father.call(this, x); + this.wife = w; + } - Son.prototype.getFamily = function getFamily() { - var upFamily = - Father.prototype.getFamily.call(this); - return upFamily + ", " + this.wife; - }; - - // for curious and non-Celtic - // http://en.wikipedia.org/wiki/Deirdre :) - fedlimid = new Father("mac Daill"); - naoise = new Son("Usnech", "Deirdre"); - - test.assertEqual(fedlimid.getFamily(), "mac Daill", - "checking creation of new simple object"); - - test.assertEqual(naoise.getWife(), "Deirdre", - "checking creation of new daughter object"); - - test.assertEqual(naoise.getFamily(), "Usnech, Deirdre", - "checking creation of new overloaded method"); + Son.prototype = util.heir(Father); + Son.prototype.constructor = Son; + + Son.prototype.getWife = function getWife() { + return this.wife; + }; + + Son.prototype.getFamily = function getFamily() { + var upFamily = + Father.prototype.getFamily.call(this); + return upFamily + ", " + this.wife; + }; + + // for curious and non-Celtic + // http://en.wikipedia.org/wiki/Deirdre :) + fedlimid = new Father("mac Daill"); + naoise = new Son("Usnech", "Deirdre"); + + test.assertEqual(fedlimid.getFamily(), "mac Daill", + "checking creation of new simple object"); + + test.assertEqual(naoise.getWife(), "Deirdre", + "checking creation of new daughter object"); + + test.assertEqual(naoise.getFamily(), "Usnech, Deirdre", + "checking creation of new overloaded method"); }; // testing util.isInList var ensureIsInListTrue = function (test) { - test.assert(util.isInList("a", ["a"]), - "conversion of a string to an array"); + test.assert(util.isInList("a", ["a"]), + "conversion of a string to an array"); }; var ensureIsInListFalse = function (test) { - test.assert(!util.isInList("b", ["a"]), - "conversion of a string to an array"); + test.assert(!util.isInList("b", ["a"]), + "conversion of a string to an array"); }; var ensureIsInListEmpty = function (test) { - test.assert(!util.isInList("b", []), - "conversion of a string to an array"); + test.assert(!util.isInList("b", []), + "conversion of a string to an array"); }; var ensureIsInListNoMember = function (test) { - test.assert(!util.isInList("", ["x"]), - "conversion of a string to an array"); + test.assert(!util.isInList("", ["x"]), + "conversion of a string to an array"); }; // testing util.filterByRegexp var ensureFilterByRegexp = function (test) { - var list = [ - { - "regexp": "test(ing|ed)", - "addr": "correct" - }, - { - "regexp": "ba.*d", - "addr": true - } - ]; - - test.assertEqual(util.filterByRegexp(list, "testing"), "correct", - "simple testing of filterByRegexp"); - test.assertEqual(util.filterByRegexp(list, "unknown value"), "", - "simple testing of filterByRegexp with non-found address"); - test.assert(util.filterByRegexp(list, "baaad"), - "simple testing of filterByRegexp with non-string return value"); + var list = [ + { + "regexp": "test(ing|ed)", + "addr": "correct" + }, + { + "regexp": "ba.*d", + "addr": true + } + ]; + + test.assertEqual(util.filterByRegexp(list, "testing"), "correct", + "simple testing of filterByRegexp"); + test.assertEqual(util.filterByRegexp(list, "unknown value"), "", + "simple testing of filterByRegexp with non-found address"); + test.assert(util.filterByRegexp(list, "baaad"), + "simple testing of filterByRegexp with non-string return value"); }; var ensureFilterByRegexpEmpty = function (test) { - test.assertRaises(function () { - util.filterByRegexp(undefined, "tralala"); - }, - "list is undefined", - "filterByRegexp throws an exception with empty list"); + test.assertRaises(function () { + util.filterByRegexp(undefined, "tralala"); + }, + "list is undefined", + "filterByRegexp throws an exception with empty list"); }; // testing util.getISODate var ensureGetISODate = function (test) { - test.assertEqual(util.getISODate("Mon May 31 2010 23:29:09 GMT+0200 (CET)"), - "2010-05-31", "conversion of a Date to ISO-formatted String"); + test.assertEqual(util.getISODate("Mon May 31 2010 23:29:09 GMT+0200 (CET)"), + "2010-05-31", "conversion of a Date to ISO-formatted String"); }; // testing util.valToArray var ensureValToArrayString = function (test) { - test.assertEqual(JSON.stringify(util.valToArray("a")), - JSON.stringify(["a"]), - "conversion of a string to an array"); + test.assertEqual(JSON.stringify(util.valToArray("a")), + JSON.stringify(["a"]), + "conversion of a string to an array"); }; var ensureValToArrayEmpty = function (test) { - test.assertEqual(JSON.stringify(util.valToArray("")), - JSON.stringify([""]), - "conversion of an empty string to an array"); + test.assertEqual(JSON.stringify(util.valToArray("")), + JSON.stringify([""]), + "conversion of an empty string to an array"); }; var ensureValToArrayArray = function (test) { - test.assertEqual(JSON.stringify(util.valToArray(["a"])), - JSON.stringify(["a"]), - "non-conversion of an array"); + test.assertEqual(JSON.stringify(util.valToArray(["a"])), + JSON.stringify(["a"]), + "non-conversion of an array"); }; // testing util.addCSVValue var ensureCSVAddedToNull = function (test) { - test.assertEqual(util.addCSVValue("", "b"), "b", - "adding a string to empty string"); + test.assertEqual(util.addCSVValue("", "b"), "b", + "adding a string to empty string"); }; var ensureCSVAddedNull = function (test) { - test.assertEqual(util.addCSVValue("a", ""), "a", - "adding nothing to a string"); + test.assertEqual(util.addCSVValue("a", ""), "a", + "adding nothing to a string"); }; var ensureCSVAddedString = function (test) { - test.assertEqual(util.addCSVValue("a", "b"), "a, b", - "adding one string to another one"); + test.assertEqual(util.addCSVValue("a", "b"), "a, b", + "adding one string to another one"); }; var ensureCSVAddedArray = function (test) { - test.assertEqual(util.addCSVValue("a", ["b", "c"]), "a, b, c", - "adding array to a string"); + test.assertEqual(util.addCSVValue("a", ["b", "c"]), "a, b, c", + "adding array to a string"); }; var ensureCSVAddedArray2Array = function (test) { - test.assertEqual(util.addCSVValue("a, b", ["c", "d"]), "a, b, c, d", - "adding one array to another"); + test.assertEqual(util.addCSVValue("a, b", ["c", "d"]), "a, b, c, d", + "adding one array to another"); }; // testing util.removeCSVValue var ensureCSVRemoveSimple = function (test) { - test.assertEqual(util.removeCSVValue("a, b", "b"), "a", - "removing one string from an array"); + test.assertEqual(util.removeCSVValue("a, b", "b"), "a", + "removing one string from an array"); }; // also checking a tolerancy against different ways of writing arrays var ensureCSVRemoveNonMember = function (test) { - test.assertEqual(util.removeCSVValue("a,b", "c"), "a, b", - "removing a string from an array of which it isn't a member"); + test.assertEqual(util.removeCSVValue("a,b", "c"), "a, b", + "removing a string from an array of which it isn't a member"); }; var ensureCSVRemoveEmpty = function (test) { - test.assertEqual(util.removeCSVValue("", "c"), "", - "removing a string from an empty array"); + test.assertEqual(util.removeCSVValue("", "c"), "", + "removing a string from an empty array"); }; // testing util.getObjectKeys var ensureGetObjectKeys = function (test) { - var testObj = { - a: 1, - b: 2 - }; - test.assertEqual(JSON.stringify(util.getObjectKeys(testObj)), - JSON.stringify(["a", "b"]), - "getting keys from a object"); + var testObj = { + a: 1, + b: 2 + }; + test.assertEqual(JSON.stringify(util.getObjectKeys(testObj)), + JSON.stringify(["a", "b"]), + "getting keys from a object"); }; // testing util.getParamsFromURL var ensureGetParamsFromURL = function (test) { - test.assertEqual(JSON.stringify(util.getParamsFromURL("https://bugzilla.redhat.com/show_bug.cgi?id=549066")), - JSON.stringify({id:"549066"}), - "simply compare result of bugzilla show_page URL"); - var complexURL = new urlMod.URL("http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient"+ - "&gfns=1&q=gg+javascript+url+parse"); - test.assertEqual(JSON.stringify(util.getParamsFromURL(complexURL)), - JSON.stringify({ - "ie":"UTF-8", - "oe":"UTF-8", - "sourceid":"navclient", - "gfns":"1", - "q":"gg+javascript+url+parse" - }), - "simply compare result of bugzilla show_page URL"); - test.assertEqual(JSON.stringify(util.getParamsFromURL("https://bugzilla.redhat.com/")), - JSON.stringify({}), - "URL without any parameters"); - test.assertRaises(function () {util.getParamsFromURL("");}, - "Missing URL value!", "No URL"); + test.assertEqual(JSON.stringify(util.getParamsFromURL("https://bugzilla.redhat.com/show_bug.cgi?id=549066")), + JSON.stringify({id:"549066"}), + "simply compare result of bugzilla show_page URL"); + var complexURL = new urlMod.URL("http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient"+ + "&gfns=1&q=gg+javascript+url+parse"); + test.assertEqual(JSON.stringify(util.getParamsFromURL(complexURL)), + JSON.stringify({ + "ie":"UTF-8", + "oe":"UTF-8", + "sourceid":"navclient", + "gfns":"1", + "q":"gg+javascript+url+parse" + }), + "simply compare result of bugzilla show_page URL"); + test.assertEqual(JSON.stringify(util.getParamsFromURL("https://bugzilla.redhat.com/")), + JSON.stringify({}), + "URL without any parameters"); + test.assertRaises(function () {util.getParamsFromURL("");}, + "Missing URL value!", "No URL"); }; // testing util.getBugNo var ensureGetBugNo = function (test) { - var bugNo = util.getBugNo("https://bugzilla.redhat.com/show_bug.cgi?id=597141"); - test.assertEqual(bugNo, 597141, "getting bug number"); - bugNo = util.getBugNo("https://bugzilla.redhat.com/show_bug.cgi?id=serialWacom"); - test.assertEqual(bugNo, "serialWacom", "getting a bug alias; there is no guarantee of getting number!"); + var bugNo = util.getBugNo("https://bugzilla.redhat.com/show_bug.cgi?id=597141"); + test.assertEqual(bugNo, 597141, "getting bug number"); + bugNo = util.getBugNo("https://bugzilla.redhat.com/show_bug.cgi?id=serialWacom"); + test.assertEqual(bugNo, "serialWacom", "getting a bug alias; there is no guarantee of getting number!"); }; diff --git a/tests/test-xmlrpc.js b/tests/test-xmlrpc.js index afb78c5..677a581 100644 --- a/tests/test-xmlrpc.js +++ b/tests/test-xmlrpc.js @@ -3,30 +3,30 @@ "use strict"; var xrpc = require("xmlrpc"); var xmlOut = "<?xml version=\"1.0\"?>\n" + - "<methodCall>\n<methodName>bugzilla.updateAttachMimeType</methodName>\n" + - "<params>\n<param>\n<value><struct>\n<member>\n<name>attach_id</name>\n" + - "<value><string>myId</string></value>\n</member>\n<member>\n" + - "<name>mime_type</name>\n<value><string>text/plain</string></value>\n</member>\n" + - "<member>\n<name>nomail</name>\n<value><string>billg@microsoft.com</string>" + - "</value>\n</member>\n</struct>\n</value>\n</param>\n<param>\n" + - "<value><string>me@example.com</string></value>\n</param>\n" + - "<param>\n<value><string>secret</string></value>\n</param>\n" + - "<param>\n<value><double>3.14</double></value>\n</param>\n" + - "<param>\n<value><boolean>1</boolean></value>\n</param>\n" + - "</params>\n</methodCall>"; + "<methodCall>\n<methodName>bugzilla.updateAttachMimeType</methodName>\n" + + "<params>\n<param>\n<value><struct>\n<member>\n<name>attach_id</name>\n" + + "<value><string>myId</string></value>\n</member>\n<member>\n" + + "<name>mime_type</name>\n<value><string>text/plain</string></value>\n</member>\n" + + "<member>\n<name>nomail</name>\n<value><string>billg@microsoft.com</string>" + + "</value>\n</member>\n</struct>\n</value>\n</param>\n<param>\n" + + "<value><string>me@example.com</string></value>\n</param>\n" + + "<param>\n<value><string>secret</string></value>\n</param>\n" + + "<param>\n<value><double>3.14</double></value>\n</param>\n" + + "<param>\n<value><boolean>1</boolean></value>\n</param>\n" + + "</params>\n</methodCall>"; // testing xrpc.XMLRPCMessage exports.ensureGenerateXMLRPC = function (test) { - var msg = new xrpc.XMLRPCMessage("bugzilla.updateAttachMimeType"); - msg.addParameter({ - 'attach_id' : "myId", - 'mime_type' : "text/plain", - 'nomail' : "billg@microsoft.com" - }); - msg.addParameter("me@example.com"); - msg.addParameter("secret"); - msg.addParameter(3.14); - msg.addParameter(true); - test.assertEqual(msg.xml(), xmlOut, - "generate XML-RPC message"); + var msg = new xrpc.XMLRPCMessage("bugzilla.updateAttachMimeType"); + msg.addParameter({ + 'attach_id' : "myId", + 'mime_type' : "text/plain", + 'nomail' : "billg@microsoft.com" + }); + msg.addParameter("me@example.com"); + msg.addParameter("secret"); + msg.addParameter(3.14); + msg.addParameter(true); + test.assertEqual(msg.xml(), xmlOut, + "generate XML-RPC message"); }; |