[Pkg-mozext-commits] [requestpolicy] 38/65: [tst][imp] xpcshell tests: static code analysis
David Prévot
taffit at moszumanska.debian.org
Fri Mar 25 22:59:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit 50d52d2a56b0432b84165639b5198e06dafacefc
Author: Martin Kimmerle <dev at 256k.de>
Date: Sun Jan 17 15:26:59 2016 +0100
[tst][imp] xpcshell tests: static code analysis
Check the XPCShell Tests code with JSHint and JSCS.
Besides that, all JSHint and JSCS issues in the "src/"
directory are now ignored, so `make static-analysis`
should not fail. These ignores are especially:
* ruleset.jsm: getHostMatches() - yield statements
* subscriptions.jsm
* The exceptions made in "src/.jshintrc" as opposed to the
. config file in the repo's root.
---
.jscsrc | 9 +-
Makefile | 7 +-
src/.jshintrc | 7 +
src/content/lib/ruleset.jsm | 3 +
src/content/lib/subscription.jsm | 8 +-
.jscsrc => tests/xpcshell/.jscsrc | 10 +-
tests/xpcshell/.jshintrc | 7 +
tests/xpcshell/head_loadrp.js | 30 ++--
tests/xpcshell/head_utils.js | 5 +
tests/xpcshell/test_fileutil.js | 2 +-
tests/xpcshell/test_jsutils.js | 1 +
tests/xpcshell/test_oldrules.js | 10 +-
tests/xpcshell/test_policymanager.js | 167 +++++++++++----------
tests/xpcshell/test_policystorage.js | 81 +++++-----
tests/xpcshell/test_subscription.js | 28 ++--
tests/xpcshell/test_wrap_function.js | 3 +-
tests/xpcshell/test_xulutils_keyboard_shortcuts.js | 1 +
17 files changed, 207 insertions(+), 172 deletions(-)
diff --git a/.jscsrc b/.jscsrc
index a3df8eb..9b65ea3 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,10 +1,9 @@
{
"preset": "google",
"fileExtensions": [".js", ".jsm"],
- "validateQuoteMarks": "\"",
+ "excludeFiles": ["**/jquery.min.js", "**/content/lib/ruleset.jsm"],
"esnext": true,
- "requireParenthesesAroundIIFE": true,
- "excludeFiles": [
- "**/jquery.min.js"
- ]
+
+ "validateQuoteMarks": "\"",
+ "requireParenthesesAroundIIFE": true
}
diff --git a/Makefile b/Makefile
index f09fa8e..6b852a8 100644
--- a/Makefile
+++ b/Makefile
@@ -430,12 +430,15 @@ marionette: venv \
# static code analysis
#-------------------------------------------------------------------------------
-.PHONY: static-analysis jshint
+.PHONY: static-analysis jshint jscs
static-analysis: jshint jscs
jshint:
jshint --extra-ext jsm --exclude '**/jquery.min.js' src/
+ jshint tests/xpcshell/
jscs:
- jscs src/
+ @echo '** NOTICE ** jscs is not run on "ruleset.jsm" because of its "yield" statement.'
+ cd src/; jscs .
+ cd tests/xpcshell/; jscs .
#===============================================================================
diff --git a/src/.jshintrc b/src/.jshintrc
new file mode 100644
index 0000000..c37de26
--- /dev/null
+++ b/src/.jshintrc
@@ -0,0 +1,7 @@
+{
+ "extends": "../.jshintrc",
+
+ "forin": false,
+ "maxcomplexity": 100,
+ "maxdepth": 6
+}
diff --git a/src/content/lib/ruleset.jsm b/src/content/lib/ruleset.jsm
index 9c143a1..02a3492 100644
--- a/src/content/lib/ruleset.jsm
+++ b/src/content/lib/ruleset.jsm
@@ -914,6 +914,8 @@ Ruleset.prototype = {
*
* @param {string} host The host to get matching entries for.
*/
+ /* jshint ignore:start */
+ // A yield statement shall be within a generator function
getHostMatches: function(host) {
if (!this.rules.isEmpty()) {
// If `this.rules` is not empty, it contains any rules which do
@@ -955,6 +957,7 @@ Ruleset.prototype = {
}
}
},
+ /* jshint ignore:end */
/**
* @param {nsIURI} origin
diff --git a/src/content/lib/subscription.jsm b/src/content/lib/subscription.jsm
index fde75f8..2bbf659 100644
--- a/src/content/lib/subscription.jsm
+++ b/src/content/lib/subscription.jsm
@@ -174,18 +174,19 @@ UserSubscriptions.prototype = {
updateResults[listName][subName] = result;
let list = updatingLists[listName];
delete list[subName];
- for (let i in list) {
+ for (let i in list) { // jshint ignore:line
return; // What's that??
}
}
delete updatingLists[listName];
- for (let i in updatingLists) {
+ for (let i in updatingLists) { // jshint ignore:line
return; // What's that??
}
setTimeout(() => callback(updateResults), 0);
}
var listCount = 0;
+ /* jshint -W083 */ // Don't make functions within a loop.
for (var listName in serials) {
if (!this._lists[listName] || !this._lists[listName].subscriptions) {
dprint("Skipping update of unsubscribed list: " + listName);
@@ -248,6 +249,7 @@ UserSubscriptions.prototype = {
dprint("Will update list: " + listName);
list.updateMetadata(metadataSuccess, metadataError);
}
+ /* jshint +W083 */ // Don't make functions within a loop.
if (listCount === 0) {
dprint("No lists to update.");
@@ -310,6 +312,7 @@ SubscriptionList.prototype = {
},
updateSubscriptions: function(userSubs, successCallback, errorCallback) {
+ /* jshint -W083 */ // Don't make functions within a loop.
for (let subName in userSubs) {
let sub;
try {
@@ -334,6 +337,7 @@ SubscriptionList.prototype = {
setTimeout(() => errorCallback(curSub, e.toString()), 0);
}
}
+ /* jshint +W083 */ // Don't make functions within a loop.
},
// getSubscriptionNames : function () {
diff --git a/.jscsrc b/tests/xpcshell/.jscsrc
similarity index 56%
copy from .jscsrc
copy to tests/xpcshell/.jscsrc
index a3df8eb..48ecdee 100644
--- a/.jscsrc
+++ b/tests/xpcshell/.jscsrc
@@ -1,10 +1,10 @@
{
"preset": "google",
- "fileExtensions": [".js", ".jsm"],
- "validateQuoteMarks": "\"",
"esnext": true,
+
+ "validateQuoteMarks": "\"",
"requireParenthesesAroundIIFE": true,
- "excludeFiles": [
- "**/jquery.min.js"
- ]
+
+ "requireCamelCaseOrUpperCaseIdentifiers": null,
+ "disallowMultipleLineBreaks": null
}
diff --git a/tests/xpcshell/.jshintrc b/tests/xpcshell/.jshintrc
new file mode 100644
index 0000000..7aa9f2e
--- /dev/null
+++ b/tests/xpcshell/.jshintrc
@@ -0,0 +1,7 @@
+{
+ "extends": "../../.jshintrc",
+
+ "undef": false,
+ "forin": false,
+ "maxcomplexity": 10
+}
diff --git a/tests/xpcshell/head_loadrp.js b/tests/xpcshell/head_loadrp.js
index 9653cf7..6192605 100644
--- a/tests/xpcshell/head_loadrp.js
+++ b/tests/xpcshell/head_loadrp.js
@@ -1,22 +1,23 @@
-// https://developer.mozilla.org/en/Writing_xpcshell-based_unit_tests
+/* exported Cc, Ci, Cr, Cu */
+const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
// Note: "resource://test" always resolves to the current test folder.
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-const Cu = Components.utils;
-
Cu.import("resource://gre/modules/Services.jsm");
-// Initialize profile.
+//------------------------------------------------------------------------------
+// Initialize the profile.
+//------------------------------------------------------------------------------
+
// This will create a Directory Service Provider for the
// profile directory. See `head.js` in mozilla-central.
// The return value is the profile directory, and can be
// simply ignored.
do_get_profile();
-
+//------------------------------------------------------------------------------
+// Register RequestPolicy's Chrome Manifest.
+//------------------------------------------------------------------------------
function getRPChromeManifest() {
var cwd = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
@@ -31,25 +32,26 @@ function registerRPChromeManifest() {
.autoRegister(getRPChromeManifest());
}
-// Register RequestPolicy's Chrome Manifest.
registerRPChromeManifest();
+//------------------------------------------------------------------------------
+// Load the default preferences
+//------------------------------------------------------------------------------
-
-// Load default preferences
Services.scriptloader.loadSubScript("chrome://rpcontinued/content/" +
"main/default-pref-handler.js", {});
+//------------------------------------------------------------------------------
+// Set up the Logger module
+//------------------------------------------------------------------------------
-
-// Setup the Logger module
{
let tmpScope = {};
Cu.import("chrome://rpcontinued/content/lib/logger.jsm", tmpScope);
// Use |do_print| instead of |dump| because that's what's
// available for xpcshell tests.
- tmpScope.Logger.printFunc = function (msg) {
+ tmpScope.Logger.printFunc = function(msg) {
do_print(msg.trimRight());
};
}
diff --git a/tests/xpcshell/head_utils.js b/tests/xpcshell/head_utils.js
index 7104c36..d4395c6 100644
--- a/tests/xpcshell/head_utils.js
+++ b/tests/xpcshell/head_utils.js
@@ -1,3 +1,8 @@
+/* exported
+ copyRulesetFileToProfile,
+ deleteFileFromProfile,
+*/
+
Components.utils.import("chrome://rpcontinued/content/lib/utils/files.jsm");
function copyRulesetFileToProfile(filename, destFilename) {
diff --git a/tests/xpcshell/test_fileutil.js b/tests/xpcshell/test_fileutil.js
index fbc3c19..a23fa5e 100644
--- a/tests/xpcshell/test_fileutil.js
+++ b/tests/xpcshell/test_fileutil.js
@@ -1,4 +1,4 @@
-
+/* exported run_test */
Components.utils.import("chrome://rpcontinued/content/lib/utils/files.jsm");
function run_test() {
diff --git a/tests/xpcshell/test_jsutils.js b/tests/xpcshell/test_jsutils.js
index 658ff6f..381fc72 100644
--- a/tests/xpcshell/test_jsutils.js
+++ b/tests/xpcshell/test_jsutils.js
@@ -1,3 +1,4 @@
+/* exported run_test */
Cu.import("chrome://rpcontinued/content/lib/utils/javascript.jsm");
function run_test() {
diff --git a/tests/xpcshell/test_oldrules.js b/tests/xpcshell/test_oldrules.js
index 90e16b6..7203469 100644
--- a/tests/xpcshell/test_oldrules.js
+++ b/tests/xpcshell/test_oldrules.js
@@ -1,9 +1,5 @@
/* exported run_test */
-/* global Cc, Ci, Cu, equal, deepEqual */
-
-/* global OldRules, OldRulesParseError */
Cu.import("chrome://rpcontinued/content/lib/old-rules.jsm");
-/* global Prefs */
Cu.import("chrome://rpcontinued/content/models/prefs.jsm");
@@ -98,7 +94,7 @@ function test_0() {
"allowedOrigins": "mozilla.org",
"allowedDestinations": "mozilla.net",
"allowedOriginsToDestinations": "mozilla.org|mozilla.net"
- }, function () {
+ }, function() {
testGetOldRulesAsNewRules([undefined, undefined, undefined], [
{o: {h: "*.mozilla.org"}},
{d: {h: "*.mozilla.net"}},
@@ -193,7 +189,7 @@ function usingOldRulePrefs(aPrefs, aFunction) {
}
// Set the prefs.
- forEachPrefName(function (prefName) {
+ forEachPrefName(function(prefName) {
let prefValue = aPrefs[prefName];
setOldRulePref(prefName, prefValue);
});
@@ -201,7 +197,7 @@ function usingOldRulePrefs(aPrefs, aFunction) {
aFunction.call(null);
// Clear the prefs.
- forEachPrefName(function (prefName) {
+ forEachPrefName(function(prefName) {
Prefs.reset(prefName);
});
}
diff --git a/tests/xpcshell/test_policymanager.js b/tests/xpcshell/test_policymanager.js
index 2f40782..760946b 100644
--- a/tests/xpcshell/test_policymanager.js
+++ b/tests/xpcshell/test_policymanager.js
@@ -1,17 +1,18 @@
+/* exported run_test */
Components.utils.import("chrome://rpcontinued/content/lib/utils/domains.jsm");
Components.utils.import("chrome://rpcontinued/content/lib/ruleset.jsm");
Components.utils.import("chrome://rpcontinued/content/lib/policy-manager.jsm");
var config = {
- "subscriptions" : {
- "foo" : {
- "name" : "The Foo RP whitelist and blacklist.",
- "updateUrls" : {
- "http://foo.com/rp.json" : {}
+ "subscriptions": {
+ "foo": {
+ "name": "The Foo RP whitelist and blacklist.",
+ "updateUrls": {
+ "http://foo.com/rp.json": {}
},
- "infoUrls" : {
- "About" : "http://foo.com/about.html"
+ "infoUrls": {
+ "About": "http://foo.com/about.html"
}
}
}
@@ -32,7 +33,7 @@ function test_0() {
var manager = new PolicyManager();
manager.loadUserRules(config);
- for (var i in manager._rulesets) {
+ for (let i in manager._rulesets) {
print("print ruleset: " + i);
manager._rulesets[i].ruleset.print(0, print);
print(JSON.stringify(manager._rulesets[i].rawRuleset));
@@ -50,7 +51,7 @@ function test_0() {
result = manager.checkRequest(origin, dest);
do_check_false(result.isDenied());
do_check_true(result.isAllowed());
- // for (var i in detailedResults) {
+ // for (let i in detailedResults) {
// print("ruleset: " + i);
// print(" allow: " + detailedResults[i]["allowMatches"]);
// print(detailedResults[i]["allowMatches"].length);
@@ -64,8 +65,8 @@ function test_0() {
// }
// }
- var origin = DomainUtil.getUriObject("http://www.foo.com/");
- var dest = DomainUtil.getUriObject("https://www.example.com/");
+ origin = DomainUtil.getUriObject("http://www.foo.com/");
+ dest = DomainUtil.getUriObject("https://www.example.com/");
result = manager.checkRequest(origin, dest);
do_check_false(result.isDenied());
@@ -75,10 +76,10 @@ function test_0() {
deleteFileFromProfile("foo.json");
}
- // Functions to test:
- // addRule
- // addTemporaryRule
- // removeRule
+// Functions to test:
+// addRule
+// addTemporaryRule
+// removeRule
/*
* Test only persistent (non-temporary) rules.
@@ -91,12 +92,12 @@ function test_1() {
var origin = DomainUtil.getUriObject("http://www.foo.com/");
var dest = DomainUtil.getUriObject("https://www.example.com/");
- var rules = {"origin" : {"o" : {"h" : "*.foo.com"}},
- "dest" : {"d" : {"h" : "www.example.com"}},
- "origin-to-dest" : {"o" : {"h" : "*.foo.com"},
- "d" : {"h" : "www.example.com"}}};
+ var rules = {"origin": {"o": {"h": "*.foo.com"}},
+ "dest": {"d": {"h": "www.example.com"}},
+ "origin-to-dest": {"o": {"h": "*.foo.com"},
+ "d": {"h": "www.example.com"}}};
- for (var i in rules) {
+ for (let i in rules) {
// Resetting the policy manager is useful for debugging failures.
// var manager = new PolicyManager();
// manager.loadUserRules();
@@ -114,9 +115,9 @@ function test_1() {
// Remove the rule we just added.
manager.removeRule(RULE_ACTION_ALLOW, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -130,17 +131,17 @@ function test_1() {
do_check_false(result.isDenied());
do_check_false(result.isAllowed());
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
// Add the original allow rule back.
manager.addRule(RULE_ACTION_ALLOW, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -150,9 +151,9 @@ function test_1() {
// Add the same rule details but as a deny rule.
manager.addRule(RULE_ACTION_DENY, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -170,9 +171,9 @@ function test_1() {
// Add same rule as an allow rule.
manager.addRule(RULE_ACTION_ALLOW, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -190,10 +191,10 @@ function test_1() {
}
- // Functions to test:
- // addRule
- // addTemporaryRule
- // removeRule
+// Functions to test:
+// addRule
+// addTemporaryRule
+// removeRule
/*
* Test only temporary rules.
@@ -206,12 +207,12 @@ function test_2() {
var origin = DomainUtil.getUriObject("http://www.foo.com/");
var dest = DomainUtil.getUriObject("https://www.example.com/");
- var rules = {"origin" : {"o" : {"h" : "*.foo.com"}},
- "dest" : {"d" : {"h" : "www.example.com"}},
- "origin-to-dest" : {"o" : {"h" : "*.foo.com"},
- "d" : {"h" : "www.example.com"}}};
+ var rules = {"origin": {"o": {"h": "*.foo.com"}},
+ "dest": {"d": {"h": "www.example.com"}},
+ "origin-to-dest": {"o": {"h": "*.foo.com"},
+ "d": {"h": "www.example.com"}}};
- for (var i in rules) {
+ for (let i in rules) {
// Resetting the policy manager is useful for debugging failures.
// var manager = new PolicyManager();
// manager.loadUserRules();
@@ -229,9 +230,9 @@ function test_2() {
// Remove the rule we just added.
manager.removeRule(RULE_ACTION_ALLOW, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -245,17 +246,17 @@ function test_2() {
do_check_false(result.isDenied());
do_check_false(result.isAllowed());
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
// Add the original allow rule back.
manager.addTemporaryRule(RULE_ACTION_ALLOW, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -265,9 +266,9 @@ function test_2() {
// Add the same rule details but as a deny rule.
manager.addTemporaryRule(RULE_ACTION_DENY, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -285,9 +286,9 @@ function test_2() {
// Add same rule as an allow rule.
manager.addTemporaryRule(RULE_ACTION_ALLOW, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -306,10 +307,10 @@ function test_2() {
- // Functions to test:
- // addRule
- // addTemporaryRule
- // removeRule
+// Functions to test:
+// addRule
+// addTemporaryRule
+// removeRule
/*
* Test both persistent and temporary rules whenever adding rules. A
@@ -323,12 +324,12 @@ function test_2() {
var origin = DomainUtil.getUriObject("http://www.foo.com/");
var dest = DomainUtil.getUriObject("https://www.example.com/");
- var rules = {"origin" : {"o" : {"h" : "*.foo.com"}},
- "dest" : {"d" : {"h" : "www.example.com"}},
- "origin-to-dest" : {"o" : {"h" : "*.foo.com"},
- "d" : {"h" : "www.example.com"}}};
+ var rules = {"origin": {"o": {"h": "*.foo.com"}},
+ "dest": {"d": {"h": "www.example.com"}},
+ "origin-to-dest": {"o": {"h": "*.foo.com"},
+ "d": {"h": "www.example.com"}}};
- for (var i in rules) {
+ for (let i in rules) {
// Resetting the policy manager is useful for debugging failures.
// var manager = new PolicyManager();
// manager.loadUserRules();
@@ -347,9 +348,9 @@ function test_2() {
// Remove the rule we just added.
manager.removeRule(RULE_ACTION_ALLOW, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -363,18 +364,18 @@ function test_2() {
do_check_false(result.isDenied());
do_check_false(result.isAllowed());
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
// Add the original allow rules back.
manager.addRule(RULE_ACTION_ALLOW, rawRule, noStore);
manager.addTemporaryRule(RULE_ACTION_ALLOW, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -385,9 +386,9 @@ function test_2() {
manager.addRule(RULE_ACTION_DENY, rawRule, noStore);
manager.addTemporaryRule(RULE_ACTION_DENY, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
@@ -407,9 +408,9 @@ function test_2() {
manager.addRule(RULE_ACTION_ALLOW, rawRule, noStore);
manager.addTemporaryRule(RULE_ACTION_ALLOW, rawRule, noStore);
- for (var i in manager._rulesets) {
- print("print ruleset: " + i);
- manager._rulesets[i].ruleset.print(0, print);
+ for (let j in manager._rulesets) {
+ print("print ruleset: " + j);
+ manager._rulesets[j].ruleset.print(0, print);
}
result = manager.checkRequest(origin, dest);
diff --git a/tests/xpcshell/test_policystorage.js b/tests/xpcshell/test_policystorage.js
index 9761cdf..c4d856a 100644
--- a/tests/xpcshell/test_policystorage.js
+++ b/tests/xpcshell/test_policystorage.js
@@ -1,29 +1,34 @@
-
+/* exported run_test */
Components.utils.import("chrome://rpcontinued/content/lib/ruleset.jsm");
Components.utils.import("chrome://rpcontinued/content/lib/ruleset-storage.jsm");
Components.utils.import("chrome://rpcontinued/content/lib/utils/constants.jsm");
// We expect JSON data to represent the following data structure.
var exampleJsonObj = {
- "metadata" : {
- "version" : 1,
- "name" : "policyname", // unique name for this policy, used in filename
- "source" : "user" // "user" or "subscription"
+ "metadata": {
+ "version": 1,
+ "name": "policyname", // unique name for this policy, used in filename
+ "source": "user" // "user" or "subscription"
},
- "entries" : {
- "allow" : [
+ "entries": {
+ "allow": [
// 'o' => origin
// 'd' => destination
// 's' => scheme
// 'port' => port ('*' for any, integer for specific port, -1 for default port [default])
// 'pathPre' => path prefix (must start with "/")
// 'pathRegex' => path regex (no enclosing characters: '^/abc' not '/^\/abc/')
- {'o':{'h':'www.foo.com'},'d':{'h':'www.bar.com'}},
- {'o':{'h':'www.example.com','s':'https','pathPre':'/test/'},'d':{'h':'www.bar.com', 's':'https'}},
+ {"o": {"h": "www.foo.com"},
+ "d": {"h": "www.bar.com"}},
+ {"o": {"h": "www.example.com",
+ "s": "https",
+ "pathPre": "/test/"},
+ "d": {"h": "www.bar.com",
+ "s": "https"}},
],
- "deny" : [
- {'d':{'h':'google-analytics.com'}},
- {'o':{'s':'https'},'d':{'s':'http'}},
+ "deny": [
+ {"d": {"h": "google-analytics.com"}},
+ {"o": {"s": "https"}, "d": {"s": "http"}},
]
}
};
@@ -56,17 +61,17 @@ function test_1() {
function test_2() {
var filename = "foo.json";
- var rules = {"origin" : {"o" : {"h" : "*.foo.com"}},
- "dest" : {"d" : {"h" : "www.example.com"}},
- "origin-to-dest" : {"o" : {"h" : "*.foo.com"},
- "d" : {"h" : "www.example.com"}}};
+ var rules = {"origin": {"o": {"h": "*.foo.com"}},
+ "dest": {"d": {"h": "www.example.com"}},
+ "origin-to-dest": {"o": {"h": "*.foo.com"},
+ "d": {"h": "www.example.com"}}};
var rawRuleset = new RawRuleset();
do_check_eq(Object.keys(rawRuleset._metadata).length, 1);
do_check_eq(rawRuleset._metadata.version, 1);
- do_check_eq(rawRuleset._entries["allow"].length, 0);
- do_check_eq(rawRuleset._entries["deny"].length, 0);
+ do_check_eq(rawRuleset._entries.allow.length, 0);
+ do_check_eq(rawRuleset._entries.deny.length, 0);
// Write it to a file and read it back.
RulesetStorage.saveRawRulesetToFile(rawRuleset, filename);
@@ -74,11 +79,11 @@ function test_2() {
do_check_eq(Object.keys(rawRuleset._metadata).length, 1);
do_check_eq(rawRuleset._metadata.version, 1);
- do_check_eq(rawRuleset._entries["allow"].length, 0);
- do_check_eq(rawRuleset._entries["deny"].length, 0);
+ do_check_eq(rawRuleset._entries.allow.length, 0);
+ do_check_eq(rawRuleset._entries.deny.length, 0);
// Add all of the rules as allow rules.
- for (var name in Iterator(rules, true)) {
+ for (let name in Iterator(rules, true)) {
// Do it twice to trigger bugs/check for duplicates.
rawRuleset.addRule(C.RULE_ACTION_ALLOW, rules[name]);
rawRuleset.addRule(C.RULE_ACTION_ALLOW, rules[name]);
@@ -88,11 +93,11 @@ function test_2() {
RulesetStorage.saveRawRulesetToFile(rawRuleset, filename);
rawRuleset = RulesetStorage.loadRawRulesetFromFile(filename);
- do_check_eq(rawRuleset._entries["allow"].length, 3);
- do_check_eq(rawRuleset._entries["deny"].length, 0);
+ do_check_eq(rawRuleset._entries.allow.length, 3);
+ do_check_eq(rawRuleset._entries.deny.length, 0);
// Add all of the rules as deny rules.
- for (var name in Iterator(rules, true)) {
+ for (let name in Iterator(rules, true)) {
// Do it twice to trigger bugs/check for duplicates.
rawRuleset.addRule(C.RULE_ACTION_DENY, rules[name]);
rawRuleset.addRule(C.RULE_ACTION_DENY, rules[name]);
@@ -102,21 +107,21 @@ function test_2() {
RulesetStorage.saveRawRulesetToFile(rawRuleset, filename);
rawRuleset = RulesetStorage.loadRawRulesetFromFile(filename);
- do_check_eq(rawRuleset._entries["allow"].length, 3);
- do_check_eq(rawRuleset._entries["deny"].length, 3);
+ do_check_eq(rawRuleset._entries.allow.length, 3);
+ do_check_eq(rawRuleset._entries.deny.length, 3);
// Remove one of the deny rules.
- rawRuleset.removeRule(C.RULE_ACTION_DENY, rules["origin"]);
+ rawRuleset.removeRule(C.RULE_ACTION_DENY, rules.origin);
// Write it to a file and read it back.
RulesetStorage.saveRawRulesetToFile(rawRuleset, filename);
rawRuleset = RulesetStorage.loadRawRulesetFromFile(filename);
- do_check_eq(rawRuleset._entries["allow"].length, 3);
- do_check_eq(rawRuleset._entries["deny"].length, 2);
+ do_check_eq(rawRuleset._entries.allow.length, 3);
+ do_check_eq(rawRuleset._entries.deny.length, 2);
// Remove all of the deny rules.
- for (var name in Iterator(rules, true)) {
+ for (let name in Iterator(rules, true)) {
// Do it twice to trigger bugs/check for duplicates.
rawRuleset.removeRule(C.RULE_ACTION_DENY, rules[name]);
rawRuleset.removeRule(C.RULE_ACTION_DENY, rules[name]);
@@ -126,21 +131,21 @@ function test_2() {
RulesetStorage.saveRawRulesetToFile(rawRuleset, filename);
rawRuleset = RulesetStorage.loadRawRulesetFromFile(filename);
- do_check_eq(rawRuleset._entries["allow"].length, 3);
- do_check_eq(rawRuleset._entries["deny"].length, 0);
+ do_check_eq(rawRuleset._entries.allow.length, 3);
+ do_check_eq(rawRuleset._entries.deny.length, 0);
// Remove one of the allow rules.
- rawRuleset.removeRule(C.RULE_ACTION_ALLOW, rules["dest"]);
+ rawRuleset.removeRule(C.RULE_ACTION_ALLOW, rules.dest);
// Write it to a file and read it back.
RulesetStorage.saveRawRulesetToFile(rawRuleset, filename);
rawRuleset = RulesetStorage.loadRawRulesetFromFile(filename);
- do_check_eq(rawRuleset._entries["allow"].length, 2);
- do_check_eq(rawRuleset._entries["deny"].length, 0);
+ do_check_eq(rawRuleset._entries.allow.length, 2);
+ do_check_eq(rawRuleset._entries.deny.length, 0);
// Remove all of the allow rules.
- for (var name in Iterator(rules, true)) {
+ for (let name in Iterator(rules, true)) {
// Do it twice to trigger bugs/check for duplicates.
rawRuleset.removeRule(C.RULE_ACTION_ALLOW, rules[name]);
rawRuleset.removeRule(C.RULE_ACTION_ALLOW, rules[name]);
@@ -150,8 +155,8 @@ function test_2() {
RulesetStorage.saveRawRulesetToFile(rawRuleset, filename);
rawRuleset = RulesetStorage.loadRawRulesetFromFile(filename);
- do_check_eq(rawRuleset._entries["allow"].length, 0);
- do_check_eq(rawRuleset._entries["deny"].length, 0);
+ do_check_eq(rawRuleset._entries.allow.length, 0);
+ do_check_eq(rawRuleset._entries.deny.length, 0);
deleteFileFromProfile(filename);
}
diff --git a/tests/xpcshell/test_subscription.js b/tests/xpcshell/test_subscription.js
index e5a7fc7..23590da 100644
--- a/tests/xpcshell/test_subscription.js
+++ b/tests/xpcshell/test_subscription.js
@@ -1,4 +1,4 @@
-
+/* exported run_test */
Components.utils.import("chrome://rpcontinued/content/lib/subscription.jsm");
function run_test() {
@@ -11,26 +11,26 @@ function test_1() {
var userSubs = new UserSubscriptions();
userSubs.save();
var serials = {
- 'official' : {
- 'embedded' : 2329159661,
- 'extensions' : 0,
- 'functionality' : 0,
- 'mozilla' : 0,
- 'sameorg' : 0,
- 'trackers' : 0
+ "official": {
+ "embedded": 2329159661,
+ "extensions": 0,
+ "functionality": 0,
+ "mozilla": 0,
+ "sameorg": 0,
+ "trackers": 0
}
};
-// var serials = {
-// };
+ // var serials = {
+ // };
userSubs.update(test_1_completed, serials);
}
function test_1_completed(updateResults) {
- if (!updateResults['official']) {
- do_throw('No "official" key in updateResults.');
+ if (!updateResults.official) {
+ do_throw("No \"official\" key in updateResults.");
}
- Logger.vardump(updateResults['official']);
- do_check_true(updateResults['official']['embedded']);
+ Logger.vardump(updateResults.official);
+ do_check_true(updateResults.official.embedded);
do_check_true(false);
do_test_finished();
//deepEqual(readJsonObj, exampleJsonObj);
diff --git a/tests/xpcshell/test_wrap_function.js b/tests/xpcshell/test_wrap_function.js
index e7b93f2..847a900 100644
--- a/tests/xpcshell/test_wrap_function.js
+++ b/tests/xpcshell/test_wrap_function.js
@@ -1,3 +1,4 @@
+/* exported run_test */
const MODULE_URI = "chrome://rpcontinued/content/lib/utils.jsm";
var functionCalls = "";
@@ -81,7 +82,7 @@ function uut_unwrap() {
function manualWrap() {
var _orig = testObj.testFunction;
- testObj.testFunction = function () {
+ testObj.testFunction = function() {
functionCalls += "{";
var rv = _orig.apply(testObj, arguments);
functionCalls += "}";
diff --git a/tests/xpcshell/test_xulutils_keyboard_shortcuts.js b/tests/xpcshell/test_xulutils_keyboard_shortcuts.js
index 2c4763e..7c072ed 100644
--- a/tests/xpcshell/test_xulutils_keyboard_shortcuts.js
+++ b/tests/xpcshell/test_xulutils_keyboard_shortcuts.js
@@ -1,3 +1,4 @@
+/* exported run_test */
Cu.import("chrome://rpcontinued/content/lib/utils/xul.jsm");
function run_test() {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list