Merge branch 'ext-work'FF_Checkpoint_1

1 files changed, 58 insertions, 0 deletions

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js
new file mode 100644
index 000000000..5e8702eb7
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js
@@ -0,0 +1,58 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const nsIBLS = Components.interfaces.nsIBlocklistService;
+
+var PLUGINS = [{
+  // Normal blacklisted plugin, before an invalid regexp
+  name: "test_bug468528_1",
+  version: "5",
+  disabled: false,
+  blocklisted: false
+},
+{
+  // Normal blacklisted plugin, with an invalid regexp
+  name: "test_bug468528_2",
+  version: "5",
+  disabled: false,
+  blocklisted: false
+},
+{
+  // Normal blacklisted plugin, after an invalid regexp
+  name: "test_bug468528_3",
+  version: "5",
+  disabled: false,
+  blocklisted: false
+},
+{
+  // Non-blocklisted plugin
+  name: "test_bug468528_4",
+  version: "5",
+  disabled: false,
+  blocklisted: false
+}];
+
+
+function run_test() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
+
+  // We cannot force the blocklist to update so just copy our test list to the profile
+  copyBlocklistToProfile(do_get_file("data/test_bug468528.xml"));
+
+  var blocklist = Components.classes["@mozilla.org/extensions/blocklist;1"]
+                            .getService(nsIBLS);
+
+  // blocked (sanity check)
+  do_check_true(blocklist.getPluginBlocklistState(PLUGINS[0], "1", "1.9") == nsIBLS.STATE_BLOCKED);
+
+  // not blocked - won't match due to invalid regexp
+  do_check_true(blocklist.getPluginBlocklistState(PLUGINS[1], "1", "1.9") == nsIBLS.STATE_NOT_BLOCKED);
+  
+  // blocked - the invalid regexp for the previous item shouldn't affect this one
+  do_check_true(blocklist.getPluginBlocklistState(PLUGINS[2], "1", "1.9") == nsIBLS.STATE_BLOCKED);
+
+  // not blocked - the previous invalid regexp shouldn't act as a wildcard
+  do_check_true(blocklist.getPluginBlocklistState(PLUGINS[3], "1", "1.9") == nsIBLS.STATE_NOT_BLOCKED);
+
+}