Issue 6820 - Move tests to mocha

test/matcher.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 const assert = require("assert");
 const {createSandbox} = require("./_common");
 
 let Filter = null;
 let RegExpFilter = null;
 let CombinedMatcher = null;
 let defaultMatcher = null;
 let Matcher = null;
+let parseURL = null;
 
 describe("Matcher", () =>
 {
   beforeEach(() =>
   {
     let sandboxedRequire = createSandbox();
     (
       {Filter, RegExpFilter} = sandboxedRequire("../lib/filterClasses"),
-      {CombinedMatcher, defaultMatcher, Matcher} = sandboxedRequire("../lib/matcher")
+      {CombinedMatcher, defaultMatcher, Matcher} = sandboxedRequire("../lib/matcher"),
+      {parseURL} = sandboxedRequire("../lib/url")
     );
   });
 
   function compareKeywords(text, expected)
   {
     for (let filter of [Filter.fromText(text), Filter.fromText("@@" + text)])
     {
       let matcher = new Matcher();
       let result = [];
       for (let i = 0; i < expected.length; i++)
       {
         let keyword = matcher.findKeyword(filter);
         result.push(keyword);
         if (keyword)
         {
           let dummyFilter = Filter.fromText("^" + keyword + "^");
           dummyFilter.filterCount = Infinity;
           matcher.add(dummyFilter);
         }
       }
 
       assert.equal(result.join(", "), expected.join(", "), "Keyword candidates for " + filter.text);
     }
   }
 
-  function checkMatch(filters, location, contentType, docDomain, thirdParty, sitekey, specificOnly, expected, expectedFirstMatch = expected)
-  {
+  function checkMatch(filters, location, contentType, docDomain, sitekey, specificOnly, expected, expectedFirstMatch = expected)
+  {
+    let url = parseURL(location);
+
     let matcher = new Matcher();
     for (let filter of filters)
       matcher.add(Filter.fromText(filter));
 
-    let result = matcher.matchesAny(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty, sitekey, specificOnly);
+    let result = matcher.matchesAny(url, RegExpFilter.typeMap[contentType], docDomain, sitekey, specificOnly);
     if (result)
       result = result.text;
 
-    assert.equal(result, expectedFirstMatch, "match(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ", " + (specificOnly ? "specificOnly" : "not-specificOnly") + ") with:\n" + filters.join("\n"));
+    assert.equal(result, expectedFirstMatch, "match(" + location + ", " + contentType + ", " + docDomain + ", " + (sitekey || "no-sitekey") + ", " + (specificOnly ? "specificOnly" : "not-specificOnly") + ") with:\n" + filters.join("\n"));
 
     let combinedMatcher = new CombinedMatcher();
     for (let i = 0; i < 2; i++)
     {
       for (let filter of filters)
         combinedMatcher.add(Filter.fromText(filter));
 
-      result = combinedMatcher.matchesAny(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty, sitekey, specificOnly);
+      result = combinedMatcher.matchesAny(url, RegExpFilter.typeMap[contentType], docDomain, sitekey, specificOnly);
       if (result)
         result = result.text;
 
-      assert.equal(result, expected, "combinedMatch(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ", " + (specificOnly ? "specificOnly" : "not-specificOnly") + ") with:\n" + filters.join("\n"));
+      assert.equal(result, expected, "combinedMatch(" + location + ", " + contentType + ", " + docDomain + ", " + (sitekey || "no-sitekey") + ", " + (specificOnly ? "specificOnly" : "not-specificOnly") + ") with:\n" + filters.join("\n"));
 
       // Generic whitelisting rules can match for specificOnly searches, so we
       // can't easily know which rule will match for these whitelisting tests
       if (specificOnly)
         continue;
 
       // For next run: add whitelisting filters for filters that aren't already
       filters = filters.map(text => text.substring(0, 2) == "@@" ? text : "@@" + text);
       if (expected && expected.substring(0, 2) != "@@")
         expected = "@@" + expected;
     }
   }
 
   function checkSearch(filters, location, contentType, docDomain,
-                       thirdParty, sitekey, specificOnly, filterType,
+                       sitekey, specificOnly, filterType,
                        expected)
   {
+    let url = parseURL(location);
+
     let matcher = new CombinedMatcher();
     for (let filter of filters)
       matcher.add(Filter.fromText(filter));
 
-    let result = matcher.search(location, RegExpFilter.typeMap[contentType],
-                                docDomain, thirdParty, sitekey, specificOnly,
+    let result = matcher.search(url, RegExpFilter.typeMap[contentType],
+                                docDomain, sitekey, specificOnly,
                                 filterType);
     for (let key in result)
       result[key] = result[key].map(filter => filter.text);
 
     assert.deepEqual(result, expected, "search(" + location + ", " +
                    contentType + ", " + docDomain + ", " +
-                   (thirdParty ? "third-party" : "first-party") + ", " +
                    (sitekey || "no-sitekey") + ", " +
                    (specificOnly ? "specificOnly" : "not-specificOnly") + ", " +
                    filterType + ") with:\n" + filters.join("\n"));
   }
 
-  function cacheCheck(matcher, location, contentType, docDomain, thirdParty, expected)
-  {
-    let result = matcher.matchesAny(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty);
+  function cacheCheck(matcher, location, contentType, docDomain, expected)
+  {
+    let url = parseURL(location);
+
+    let result = matcher.matchesAny(url, RegExpFilter.typeMap[contentType], docDomain);
     if (result)
       result = result.text;
 
-    assert.equal(result, expected, "match(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ") with static filters");
+    assert.equal(result, expected, "match(" + location + ", " + contentType + ", " + docDomain + ") with static filters");
   }
 
   it("Class Definitions", () =>
   {
     assert.equal(typeof Matcher, "function", "typeof Matcher");
     assert.equal(typeof CombinedMatcher, "function", "typeof CombinedMatcher");
     assert.equal(typeof defaultMatcher, "object", "typeof defaultMatcher");
     assert.ok(defaultMatcher instanceof CombinedMatcher, "defaultMatcher is a CombinedMatcher instance");
   });
 
@@ skipping 14 matching lines @@
     compareKeywords("^foo%2Ebar^", ["foo%2ebar"]);
     compareKeywords("^aSdF^1234", ["asdf"]);
     compareKeywords("_asdf_1234_", ["asdf", "1234"]);
     compareKeywords("+asdf-1234=", ["asdf", "1234"]);
     compareKeywords("/123^ad2&ad&", ["123", "ad2"]);
     compareKeywords("/123^ad2&ad$script,domain=example.com", ["123", "ad2"]);
   });
 
   it("Filter Matching", () =>
   {
-    checkMatch([], "http://abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["abc"], "http://abc/def", "IMAGE", null, false, null, false, "abc");
-    checkMatch(["abc", "ddd"], "http://abc/def", "IMAGE", null, false, null, false, "abc");
-    checkMatch(["ddd", "abc"], "http://abc/def", "IMAGE", null, false, null, false, "abc");
-    checkMatch(["ddd", "abd"], "http://abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["abc", "://abc/d"], "http://abc/def", "IMAGE", null, false, null, false, "://abc/d");
-    checkMatch(["://abc/d", "abc"], "http://abc/def", "IMAGE", null, false, null, false, "://abc/d");
-    checkMatch(["|http://"], "http://abc/def", "IMAGE", null, false, null, false, "|http://");
-    checkMatch(["|http://abc"], "http://abc/def", "IMAGE", null, false, null, false, "|http://abc");
-    checkMatch(["|abc"], "http://abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["|/abc/def"], "http://abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["/def|"], "http://abc/def", "IMAGE", null, false, null, false, "/def|");
-    checkMatch(["/abc/def|"], "http://abc/def", "IMAGE", null, false, null, false, "/abc/def|");
-    checkMatch(["/abc/|"], "http://abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["http://abc/|"], "http://abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["|http://abc/def|"], "http://abc/def", "IMAGE", null, false, null, false, "|http://abc/def|");
-    checkMatch(["|/abc/def|"], "http://abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["|http://abc/|"], "http://abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["|/abc/|"], "http://abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["||example.com/abc"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||example.com/abc");
-    checkMatch(["||com/abc/def"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||com/abc/def");
-    checkMatch(["||com/abc"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||com/abc");
-    checkMatch(["||mple.com/abc"], "http://example.com/abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["||.com/abc/def"], "http://example.com/abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["||http://example.com/"], "http://example.com/abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["||example.com/abc/def|"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||example.com/abc/def|");
-    checkMatch(["||com/abc/def|"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||com/abc/def|");
-    checkMatch(["||example.com/abc|"], "http://example.com/abc/def", "IMAGE", null, false, null, false, null);
-    checkMatch(["abc", "://abc/d", "asdf1234"], "http://abc/def", "IMAGE", null, false, null, false, "://abc/d");
-    checkMatch(["foo*://abc/d", "foo*//abc/de", "://abc/de", "asdf1234"], "http://abc/def", "IMAGE", null, false, null, false, "://abc/de");
-    checkMatch(["abc$third-party", "abc$~third-party", "ddd"], "http://abc/def", "IMAGE", null, false, null, false, "abc$~third-party");
-    checkMatch(["abc$third-party", "abc$~third-party", "ddd"], "http://abc/def", "IMAGE", null, true, null, false, "abc$third-party");
-    checkMatch(["//abc/def$third-party", "//abc/def$~third-party", "//abc_def"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def$~third-party");
-    checkMatch(["//abc/def$third-party", "//abc/def$~third-party", "//abc_def"], "http://abc/def", "IMAGE", null, true, null, false, "//abc/def$third-party");
-    checkMatch(["abc$third-party", "abc$~third-party", "//abc/def"], "http://abc/def", "IMAGE", null, true, null, false, "//abc/def");
-    checkMatch(["//abc/def", "abc$third-party", "abc$~third-party"], "http://abc/def", "IMAGE", null, true, null, false, "//abc/def");
-    checkMatch(["abc$third-party", "abc$~third-party", "//abc/def$third-party"], "http://abc/def", "IMAGE", null, true, null, false, "//abc/def$third-party");
-    checkMatch(["abc$third-party", "abc$~third-party", "//abc/def$third-party"], "http://abc/def", "IMAGE", null, false, null, false, "abc$~third-party");
-    checkMatch(["abc$third-party", "abc$~third-party", "//abc/def$~third-party"], "http://abc/def", "IMAGE", null, true, null, false, "abc$third-party");
-    checkMatch(["abc$image", "abc$script", "abc$~image"], "http://abc/def", "IMAGE", null, false, null, false, "abc$image");
-    checkMatch(["abc$image", "abc$script", "abc$~script"], "http://abc/def", "SCRIPT", null, false, null, false, "abc$script");
-    checkMatch(["abc$image", "abc$script", "abc$~image"], "http://abc/def", "OTHER", null, false, null, false, "abc$~image");
-    checkMatch(["//abc/def$image", "//abc/def$script", "//abc/def$~image"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def$image");
-    checkMatch(["//abc/def$image", "//abc/def$script", "//abc/def$~script"], "http://abc/def", "SCRIPT", null, false, null, false, "//abc/def$script");
-    checkMatch(["//abc/def$image", "//abc/def$script", "//abc/def$~image"], "http://abc/def", "OTHER", null, false, null, false, "//abc/def$~image");
-    checkMatch(["abc$image", "abc$~image", "//abc/def"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def");
-    checkMatch(["//abc/def", "abc$image", "abc$~image"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def");
-    checkMatch(["abc$image", "abc$~image", "//abc/def$image"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def$image");
-    checkMatch(["abc$image", "abc$~image", "//abc/def$script"], "http://abc/def", "IMAGE", null, false, null, false, "abc$image");
-    checkMatch(["abc$domain=foo.com", "abc$domain=bar.com", "abc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "foo.com", false, null, false, "abc$domain=foo.com");
-    checkMatch(["abc$domain=foo.com", "abc$domain=bar.com", "abc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "bar.com", false, null, false, "abc$domain=bar.com");
-    checkMatch(["abc$domain=foo.com", "abc$domain=bar.com", "abc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "baz.com", false, null, false, "abc$domain=~foo.com|~bar.com");
-    checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "foo.com", false, null, false, "abc$domain=foo.com");
-    checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "bar.com", false, null, false, null);
-    checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "baz.com", false, null, false, null);
-    checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://ccc/def", "IMAGE", "baz.com", false, null, false, "ccc$domain=~foo.com|~bar.com");
-    checkMatch(["abc$sitekey=foo-publickey", "abc$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "foo.com", false, "foo-publickey", false, "abc$sitekey=foo-publickey");
-    checkMatch(["abc$sitekey=foo-publickey", "abc$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "bar.com", false, "bar-publickey", false, "abc$sitekey=bar-publickey");
-    checkMatch(["abc$sitekey=foo-publickey", "cba$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "bar.com", false, "bar-publickey", false, null);
-    checkMatch(["abc$sitekey=foo-publickey", "cba$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "baz.com", false, null, false, null);
-    checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "foo.com", false, "foo-publickey", false, "abc$sitekey=foo-publickey,domain=foo.com");
-    checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "foo.com", false, "bar-publickey", false, null);
-    checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "bar.com", false, "foo-publickey", false, null);
-    checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "bar.com", false, "bar-publickey", false, "abc$sitekey=bar-publickey,domain=bar.com");
-    checkMatch(["@@foo.com$document"], "http://foo.com/bar", "DOCUMENT", "foo.com", false, null, false, "@@foo.com$document");
-    checkMatch(["@@foo.com$elemhide"], "http://foo.com/bar", "ELEMHIDE", "foo.com", false, null, false, "@@foo.com$elemhide");
-    checkMatch(["@@foo.com$generichide"], "http://foo.com/bar", "GENERICHIDE", "foo.com", false, null, false, "@@foo.com$generichide");
-    checkMatch(["@@foo.com$genericblock"], "http://foo.com/bar", "GENERICBLOCK", "foo.com", false, null, false, "@@foo.com$genericblock");
-    checkMatch(["@@bar.com$document"], "http://foo.com/bar", "DOCUMENT", "foo.com", false, null, false, null);
-    checkMatch(["@@bar.com$elemhide"], "http://foo.com/bar", "ELEMHIDE", "foo.com", false, null, false, null);
-    checkMatch(["@@bar.com$generichide"], "http://foo.com/bar", "GENERICHIDE", "foo.com", false, null, false, null);
-    checkMatch(["@@bar.com$genericblock"], "http://foo.com/bar", "GENERICBLOCK", "foo.com", false, null, false, null);
-    checkMatch(["/bar"], "http://foo.com/bar", "IMAGE", "foo.com", false, null, true, null);
-    checkMatch(["/bar$domain=foo.com"], "http://foo.com/bar", "IMAGE", "foo.com", false, null, true, "/bar$domain=foo.com");
-    checkMatch(["@@||foo.com^"], "http://foo.com/bar", "IMAGE", "foo.com", false, null, false, null, "@@||foo.com^");
-    checkMatch(["/bar", "@@||foo.com^"], "http://foo.com/bar", "IMAGE", "foo.com", false, null, false, "@@||foo.com^");
-    checkMatch(["/bar", "@@||foo.com^"], "http://foo.com/foo", "IMAGE", "foo.com", false, null, false, null, "@@||foo.com^");
-    checkMatch(["||foo.com^$popup"], "http://foo.com/bar", "POPUP", "foo.com", false, null, false, "||foo.com^$popup");
-    checkMatch(["@@||foo.com^$popup"], "http://foo.com/bar", "POPUP", "foo.com", false, null, false, null, "@@||foo.com^$popup");
-    checkMatch(["||foo.com^$popup", "@@||foo.com^$popup"], "http://foo.com/bar", "POPUP", "foo.com", false, null, false, "@@||foo.com^$popup", "||foo.com^$popup");
-    checkMatch(["||foo.com^$csp=script-src 'none'"], "http://foo.com/bar", "CSP", "foo.com", false, null, false, "||foo.com^$csp=script-src 'none'");
-    checkMatch(["@@||foo.com^$csp"], "http://foo.com/bar", "CSP", "foo.com", false, null, false, null, "@@||foo.com^$csp");
-    checkMatch(["||foo.com^$csp=script-src 'none'", "@@||foo.com^$csp"], "http://foo.com/bar", "CSP", "foo.com", false, null, false, "@@||foo.com^$csp", "||foo.com^$csp=script-src 'none'");
+    checkMatch([], "http://abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["abc"], "http://abc/def", "IMAGE", null, null, false, "abc");
+    checkMatch(["abc", "ddd"], "http://abc/def", "IMAGE", null, null, false, "abc");
+    checkMatch(["ddd", "abc"], "http://abc/def", "IMAGE", null, null, false, "abc");
+    checkMatch(["ddd", "abd"], "http://abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["abc", "://abc/d"], "http://abc/def", "IMAGE", null, null, false, "://abc/d");
+    checkMatch(["://abc/d", "abc"], "http://abc/def", "IMAGE", null, null, false, "://abc/d");
+    checkMatch(["|http://"], "http://abc/def", "IMAGE", null, null, false, "|http://");
+    checkMatch(["|http://abc"], "http://abc/def", "IMAGE", null, null, false, "|http://abc");
+    checkMatch(["|abc"], "http://abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["|/abc/def"], "http://abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["/def|"], "http://abc/def", "IMAGE", null, null, false, "/def|");
+    checkMatch(["/abc/def|"], "http://abc/def", "IMAGE", null, null, false, "/abc/def|");
+    checkMatch(["/abc/|"], "http://abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["http://abc/|"], "http://abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["|http://abc/def|"], "http://abc/def", "IMAGE", null, null, false, "|http://abc/def|");
+    checkMatch(["|/abc/def|"], "http://abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["|http://abc/|"], "http://abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["|/abc/|"], "http://abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["||example.com/abc"], "http://example.com/abc/def", "IMAGE", null, null, false, "||example.com/abc");
+    checkMatch(["||com/abc/def"], "http://example.com/abc/def", "IMAGE", null, null, false, "||com/abc/def");
+    checkMatch(["||com/abc"], "http://example.com/abc/def", "IMAGE", null, null, false, "||com/abc");
+    checkMatch(["||mple.com/abc"], "http://example.com/abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["||.com/abc/def"], "http://example.com/abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["||http://example.com/"], "http://example.com/abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["||example.com/abc/def|"], "http://example.com/abc/def", "IMAGE", null, null, false, "||example.com/abc/def|");
+    checkMatch(["||com/abc/def|"], "http://example.com/abc/def", "IMAGE", null, null, false, "||com/abc/def|");
+    checkMatch(["||example.com/abc|"], "http://example.com/abc/def", "IMAGE", null, null, false, null);
+    checkMatch(["abc", "://abc/d", "asdf1234"], "http://abc/def", "IMAGE", null, null, false, "://abc/d");
+    checkMatch(["foo*://abc/d", "foo*//abc/de", "://abc/de", "asdf1234"], "http://abc/def", "IMAGE", null, null, false, "://abc/de");
+    checkMatch(["abc$third-party", "abc$~third-party", "ddd"], "http://abc/def", "IMAGE", null, null, false, "abc$~third-party");
+    checkMatch(["abc$third-party", "abc$~third-party", "ddd"], "http://abc/def", "IMAGE", "other-domain", null, false, "abc$third-party");
+    checkMatch(["//abc/def$third-party", "//abc/def$~third-party", "//abc_def"], "http://abc/def", "IMAGE", null, null, false, "//abc/def$~third-party");
+    checkMatch(["//abc/def$third-party", "//abc/def$~third-party", "//abc_def"], "http://abc/def", "IMAGE", "other-domain", null, false, "//abc/def$third-party");
+    checkMatch(["abc$third-party", "abc$~third-party", "//abc/def"], "http://abc/def", "IMAGE", null, null, false, "//abc/def");
+    checkMatch(["//abc/def", "abc$third-party", "abc$~third-party"], "http://abc/def", "IMAGE", null, null, false, "//abc/def");
+    checkMatch(["abc$third-party", "abc$~third-party", "//abc/def$third-party"], "http://abc/def", "IMAGE", "other-domain", null, false, "//abc/def$third-party");
+    checkMatch(["abc$third-party", "abc$~third-party", "//abc/def$third-party"], "http://abc/def", "IMAGE", null, null, false, "abc$~third-party");
+    checkMatch(["abc$third-party", "abc$~third-party", "//abc/def$~third-party"], "http://abc/def", "IMAGE", "other-domain", null, false, "abc$third-party");
+    checkMatch(["abc$image", "abc$script", "abc$~image"], "http://abc/def", "IMAGE", null, null, false, "abc$image");
+    checkMatch(["abc$image", "abc$script", "abc$~script"], "http://abc/def", "SCRIPT", null, null, false, "abc$script");
+    checkMatch(["abc$image", "abc$script", "abc$~image"], "http://abc/def", "OTHER", null, null, false, "abc$~image");
+    checkMatch(["//abc/def$image", "//abc/def$script", "//abc/def$~image"], "http://abc/def", "IMAGE", null, null, false, "//abc/def$image");
+    checkMatch(["//abc/def$image", "//abc/def$script", "//abc/def$~script"], "http://abc/def", "SCRIPT", null, null, false, "//abc/def$script");
+    checkMatch(["//abc/def$image", "//abc/def$script", "//abc/def$~image"], "http://abc/def", "OTHER", null, null, false, "//abc/def$~image");
+    checkMatch(["abc$image", "abc$~image", "//abc/def"], "http://abc/def", "IMAGE", null, null, false, "//abc/def");
+    checkMatch(["//abc/def", "abc$image", "abc$~image"], "http://abc/def", "IMAGE", null, null, false, "//abc/def");
+    checkMatch(["abc$image", "abc$~image", "//abc/def$image"], "http://abc/def", "IMAGE", null, null, false, "//abc/def$image");
+    checkMatch(["abc$image", "abc$~image", "//abc/def$script"], "http://abc/def", "IMAGE", null, null, false, "abc$image");
+    checkMatch(["abc$domain=foo.com", "abc$domain=bar.com", "abc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "foo.com", null, false, "abc$domain=foo.com");
+    checkMatch(["abc$domain=foo.com", "abc$domain=bar.com", "abc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "bar.com", null, false, "abc$domain=bar.com");
+    checkMatch(["abc$domain=foo.com", "abc$domain=bar.com", "abc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "baz.com", null, false, "abc$domain=~foo.com|~bar.com");
+    checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "foo.com", null, false, "abc$domain=foo.com");
+    checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "bar.com", null, false, null);
+    checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "baz.com", null, false, null);
+    checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://ccc/def", "IMAGE", "baz.com", null, false, "ccc$domain=~foo.com|~bar.com");
+    checkMatch(["abc$sitekey=foo-publickey", "abc$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "foo.com", "foo-publickey", false, "abc$sitekey=foo-publickey");
+    checkMatch(["abc$sitekey=foo-publickey", "abc$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "bar.com", "bar-publickey", false, "abc$sitekey=bar-publickey");
+    checkMatch(["abc$sitekey=foo-publickey", "cba$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "bar.com", "bar-publickey", false, null);
+    checkMatch(["abc$sitekey=foo-publickey", "cba$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "baz.com", null, false, null);
+    checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "foo.com", "foo-publickey", false, "abc$sitekey=foo-publickey,domain=foo.com");
+    checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "foo.com", "bar-publickey", false, null);
+    checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "bar.com", "foo-publickey", false, null);
+    checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "bar.com", "bar-publickey", false, "abc$sitekey=bar-publickey,domain=bar.com");
+    checkMatch(["@@foo.com$document"], "http://foo.com/bar", "DOCUMENT", "foo.com", null, false, "@@foo.com$document");
+    checkMatch(["@@foo.com$elemhide"], "http://foo.com/bar", "ELEMHIDE", "foo.com", null, false, "@@foo.com$elemhide");
+    checkMatch(["@@foo.com$generichide"], "http://foo.com/bar", "GENERICHIDE", "foo.com", null, false, "@@foo.com$generichide");
+    checkMatch(["@@foo.com$genericblock"], "http://foo.com/bar", "GENERICBLOCK", "foo.com", null, false, "@@foo.com$genericblock");
+    checkMatch(["@@bar.com$document"], "http://foo.com/bar", "DOCUMENT", "foo.com", null, false, null);
+    checkMatch(["@@bar.com$elemhide"], "http://foo.com/bar", "ELEMHIDE", "foo.com", null, false, null);
+    checkMatch(["@@bar.com$generichide"], "http://foo.com/bar", "GENERICHIDE", "foo.com", null, false, null);
+    checkMatch(["@@bar.com$genericblock"], "http://foo.com/bar", "GENERICBLOCK", "foo.com", null, false, null);
+    checkMatch(["/bar"], "http://foo.com/bar", "IMAGE", "foo.com", null, true, null);
+    checkMatch(["/bar$domain=foo.com"], "http://foo.com/bar", "IMAGE", "foo.com", null, true, "/bar$domain=foo.com");
+    checkMatch(["@@||foo.com^"], "http://foo.com/bar", "IMAGE", "foo.com", null, false, null, "@@||foo.com^");
+    checkMatch(["/bar", "@@||foo.com^"], "http://foo.com/bar", "IMAGE", "foo.com", null, false, "@@||foo.com^");
+    checkMatch(["/bar", "@@||foo.com^"], "http://foo.com/foo", "IMAGE", "foo.com", null, false, null, "@@||foo.com^");
+    checkMatch(["||foo.com^$popup"], "http://foo.com/bar", "POPUP", "foo.com", null, false, "||foo.com^$popup");
+    checkMatch(["@@||foo.com^$popup"], "http://foo.com/bar", "POPUP", "foo.com", null, false, null, "@@||foo.com^$popup");
+    checkMatch(["||foo.com^$popup", "@@||foo.com^$popup"], "http://foo.com/bar", "POPUP", "foo.com", null, false, "@@||foo.com^$popup", "||foo.com^$popup");
+    checkMatch(["||foo.com^$csp=script-src 'none'"], "http://foo.com/bar", "CSP", "foo.com", null, false, "||foo.com^$csp=script-src 'none'");
+    checkMatch(["@@||foo.com^$csp"], "http://foo.com/bar", "CSP", "foo.com", null, false, null, "@@||foo.com^$csp");
+    checkMatch(["||foo.com^$csp=script-src 'none'", "@@||foo.com^$csp"], "http://foo.com/bar", "CSP", "foo.com", null, false, "@@||foo.com^$csp", "||foo.com^$csp=script-src 'none'");
 
     // See #7312.
-    checkMatch(["^foo/bar/$script"], "http://foo/bar/", "SCRIPT", "example.com", true, null, true, null);
-    checkMatch(["^foo/bar/$script"], "http://foo/bar/", "SCRIPT", "example.com", true, null, false, "^foo/bar/$script");
-    checkMatch(["^foo/bar/$script,domain=example.com", "@@^foo/bar/$script"], "http://foo/bar/", "SCRIPT", "example.com", true, null, true, "@@^foo/bar/$script", "^foo/bar/$script,domain=example.com");
-    checkMatch(["@@^foo/bar/$script", "^foo/bar/$script,domain=example.com"], "http://foo/bar/", "SCRIPT", "example.com", true, null, true, "@@^foo/bar/$script", "^foo/bar/$script,domain=example.com");
-    checkMatch(["@@^foo/bar/$script", "^foo/bar/$script,domain=example.com"], "http://foo/bar/", "SCRIPT", "example.com", true, null, false, "@@^foo/bar/$script");
+    checkMatch(["^foo/bar/$script"], "http://foo/bar/", "SCRIPT", "example.com", null, true, null);
+    checkMatch(["^foo/bar/$script"], "http://foo/bar/", "SCRIPT", "example.com", null, false, "^foo/bar/$script");
+    checkMatch(["^foo/bar/$script,domain=example.com", "@@^foo/bar/$script"], "http://foo/bar/", "SCRIPT", "example.com", null, true, "@@^foo/bar/$script", "^foo/bar/$script,domain=example.com");
+    checkMatch(["@@^foo/bar/$script", "^foo/bar/$script,domain=example.com"], "http://foo/bar/", "SCRIPT", "example.com", null, true, "@@^foo/bar/$script", "^foo/bar/$script,domain=example.com");
+    checkMatch(["@@^foo/bar/$script", "^foo/bar/$script,domain=example.com"], "http://foo/bar/", "SCRIPT", "example.com", null, false, "@@^foo/bar/$script");
   });
 
   it("Filter Search", () =>
   {
     // Start with three filters: foo, bar, and @@foo
     let filters = ["foo", "bar", "@@foo"];
 
     checkSearch(filters, "http://example.com/foo", "IMAGE", "example.com",
-                false, null, false, "all",
+                null, false, "all",
                 {blocking: ["foo"], whitelist: ["@@foo"]});
 
     // Blocking only.
     checkSearch(filters, "http://example.com/foo", "IMAGE", "example.com",
-                false, null, false, "blocking", {blocking: ["foo"]});
+                null, false, "blocking", {blocking: ["foo"]});
 
     // Whitelist only.
     checkSearch(filters, "http://example.com/foo", "IMAGE", "example.com",
-                false, null, false, "whitelist", {whitelist: ["@@foo"]});
+                null, false, "whitelist", {whitelist: ["@@foo"]});
 
     // Different URLs.
     checkSearch(filters, "http://example.com/bar", "IMAGE", "example.com",
-                false, null, false, "all", {blocking: ["bar"], whitelist: []});
+                null, false, "all", {blocking: ["bar"], whitelist: []});
     checkSearch(filters, "http://example.com/foo/bar", "IMAGE",
-                "example.com", false, null, false, "all",
+                "example.com", null, false, "all",
                 {blocking: ["foo", "bar"], whitelist: ["@@foo"]});
 
     // Non-matching content type.
     checkSearch(filters, "http://example.com/foo", "CSP", "example.com",
-                false, null, false, "all", {blocking: [], whitelist: []});
+                null, false, "all", {blocking: [], whitelist: []});
 
     // Non-matching specificity.
     checkSearch(filters, "http://example.com/foo", "IMAGE", "example.com",
-                false, null, true, "all", {blocking: [], whitelist: ["@@foo"]});
+                null, true, "all", {blocking: [], whitelist: ["@@foo"]});
   });
 
   it("Result cache checks", () =>
   {
     let matcher = new CombinedMatcher();
     matcher.add(Filter.fromText("abc$image"));
     matcher.add(Filter.fromText("abc$script"));
     matcher.add(Filter.fromText("abc$~image,~script,~media,~ping"));
     matcher.add(Filter.fromText("cba$third-party"));
     matcher.add(Filter.fromText("cba$~third-party,~script"));
     matcher.add(Filter.fromText("http://def$image"));
     matcher.add(Filter.fromText("http://def$script"));
     matcher.add(Filter.fromText("http://def$~image,~script,~media,~ping"));
     matcher.add(Filter.fromText("http://fed$third-party"));
     matcher.add(Filter.fromText("http://fed$~third-party,~script"));
 
-    cacheCheck(matcher, "http://abc", "IMAGE", null, false, "abc$image");
-    cacheCheck(matcher, "http://abc", "SCRIPT", null, false, "abc$script");
-    cacheCheck(matcher, "http://abc", "OTHER", null, false, "abc$~image,~script,~media,~ping");
-    cacheCheck(matcher, "http://cba", "IMAGE", null, false, "cba$~third-party,~script");
-    cacheCheck(matcher, "http://cba", "IMAGE", null, true, "cba$third-party");
-    cacheCheck(matcher, "http://def", "IMAGE", null, false, "http://def$image");
-    cacheCheck(matcher, "http://def", "SCRIPT", null, false, "http://def$script");
-    cacheCheck(matcher, "http://def", "OTHER", null, false, "http://def$~image,~script,~media,~ping");
-    cacheCheck(matcher, "http://fed", "IMAGE", null, false, "http://fed$~third-party,~script");
-    cacheCheck(matcher, "http://fed", "IMAGE", null, true, "http://fed$third-party");
-    cacheCheck(matcher, "http://abc_cba", "MEDIA", null, false, "cba$~third-party,~script");
-    cacheCheck(matcher, "http://abc_cba", "MEDIA", null, true, "cba$third-party");
-    cacheCheck(matcher, "http://abc_cba", "SCRIPT", null, false, "abc$script");
-    cacheCheck(matcher, "http://def?http://fed", "MEDIA", null, false, "http://fed$~third-party,~script");
-    cacheCheck(matcher, "http://def?http://fed", "MEDIA", null, true, "http://fed$third-party");
-    cacheCheck(matcher, "http://def?http://fed", "SCRIPT", null, false, "http://def$script");
+    cacheCheck(matcher, "http://abc", "IMAGE", null, "abc$image");
+    cacheCheck(matcher, "http://abc", "SCRIPT", null, "abc$script");
+    cacheCheck(matcher, "http://abc", "OTHER", null, "abc$~image,~script,~media,~ping");
+    cacheCheck(matcher, "http://cba", "IMAGE", null, "cba$~third-party,~script");
+    cacheCheck(matcher, "http://cba", "IMAGE", "other-domain", "cba$third-party");
+    cacheCheck(matcher, "http://def", "IMAGE", null, "http://def$image");
+    cacheCheck(matcher, "http://def", "SCRIPT", null, "http://def$script");
+    cacheCheck(matcher, "http://def", "OTHER", null, "http://def$~image,~script,~media,~ping");
+    cacheCheck(matcher, "http://fed", "IMAGE", null, "http://fed$~third-party,~script");
+    cacheCheck(matcher, "http://fed", "IMAGE", "other-domain", "http://fed$third-party");
+    cacheCheck(matcher, "http://abc_cba", "MEDIA", null, "cba$~third-party,~script");
+    cacheCheck(matcher, "http://abc_cba", "MEDIA", "other-domain", "cba$third-party");
+    cacheCheck(matcher, "http://abc_cba", "SCRIPT", null, "abc$script");
+    cacheCheck(matcher, "http://def?http://fed", "MEDIA", null, "http://fed$~third-party,~script");
+    cacheCheck(matcher, "http://def?http://fed", "MEDIA", "other-domain", "http://fed$third-party");
+    cacheCheck(matcher, "http://def?http://fed", "SCRIPT", null, "http://def$script");
   });
 
   it("Whitelisted", () =>
   {
     let matcher = new CombinedMatcher();
 
-    assert.ok(!matcher.isWhitelisted("https://example.com/foo",
+    assert.ok(!matcher.isWhitelisted(parseURL("https://example.com/foo"),
                                      RegExpFilter.typeMap.IMAGE));
-    assert.ok(!matcher.isWhitelisted("https://example.com/bar",
+    assert.ok(!matcher.isWhitelisted(parseURL("https://example.com/bar"),
                                      RegExpFilter.typeMap.IMAGE));
-    assert.ok(!matcher.isWhitelisted("https://example.com/foo",
+    assert.ok(!matcher.isWhitelisted(parseURL("https://example.com/foo"),
                                      RegExpFilter.typeMap.SUBDOCUMENT));
 
     matcher.add(Filter.fromText("@@/foo^$image"));
 
-    assert.ok(matcher.isWhitelisted("https://example.com/foo",
+    assert.ok(matcher.isWhitelisted(parseURL("https://example.com/foo"),
                                     RegExpFilter.typeMap.IMAGE));
-    assert.ok(!matcher.isWhitelisted("https://example.com/bar",
+    assert.ok(!matcher.isWhitelisted(parseURL("https://example.com/bar"),
                                      RegExpFilter.typeMap.IMAGE));
-    assert.ok(!matcher.isWhitelisted("https://example.com/foo",
+    assert.ok(!matcher.isWhitelisted(parseURL("https://example.com/foo"),
                                      RegExpFilter.typeMap.SUBDOCUMENT));
 
     matcher.remove(Filter.fromText("@@/foo^$image"));
 
-    assert.ok(!matcher.isWhitelisted("https://example.com/foo",
+    assert.ok(!matcher.isWhitelisted(parseURL("https://example.com/foo"),
                                      RegExpFilter.typeMap.IMAGE));
-    assert.ok(!matcher.isWhitelisted("https://example.com/bar",
+    assert.ok(!matcher.isWhitelisted(parseURL("https://example.com/bar"),
                                      RegExpFilter.typeMap.IMAGE));
-    assert.ok(!matcher.isWhitelisted("https://example.com/foo",
+    assert.ok(!matcher.isWhitelisted(parseURL("https://example.com/foo"),
                                      RegExpFilter.typeMap.SUBDOCUMENT));
   });
 
   it("Add remove by keyword", () =>
   {
     let matcher = new CombinedMatcher();
 
-    matcher.add(Filter.fromText("||example.com/foo/bar/image.jpg^"));
+    matcher.add(Filter.fromText("||example.com/foo/bar/ad.jpg^"));
 
     // Add the same filter a second time to make sure it doesn't get added again
     // by a different keyword.
-    matcher.add(Filter.fromText("||example.com/foo/bar/image.jpg^"));
-
-    assert.ok(!!matcher.matchesAny("https://example.com/foo/bar/image.jpg",
+    matcher.add(Filter.fromText("||example.com/foo/bar/ad.jpg^"));
+
+    assert.ok(!!matcher.matchesAny(parseURL("https://example.com/foo/bar/ad.jpg"),
                                    RegExpFilter.typeMap.IMAGE));
 
-    matcher.remove(Filter.fromText("||example.com/foo/bar/image.jpg^"));
+    matcher.remove(Filter.fromText("||example.com/foo/bar/ad.jpg^"));
 
     // Make sure the filter got removed so there is no match.
-    assert.ok(!matcher.matchesAny("https://example.com/foo/bar/image.jpg",
+    assert.ok(!matcher.matchesAny(parseURL("https://example.com/foo/bar/ad.jpg"),
                                   RegExpFilter.typeMap.IMAGE));
 
 
     // Map { "example" => { text: "||example.com^$~third-party" } }
     matcher.add(Filter.fromText("||example.com^$~third-party"));
 
     assert.equal(matcher._blacklist._filterDomainMapsByKeyword.size, 1);
 
     for (let [key, value] of matcher._blacklist._filterDomainMapsByKeyword)
     {
       assert.equal(key, "example");
       assert.deepEqual(value, Filter.fromText("||example.com^$~third-party"));
       break;
     }
 
-    assert.ok(!!matcher.matchesAny("https://example.com/example/image.jpg",
-                                   RegExpFilter.typeMap.IMAGE, "example.com",
-                                   false));
+    assert.ok(!!matcher.matchesAny(parseURL("https://example.com/example/ad.jpg"),
+                                   RegExpFilter.typeMap.IMAGE, "example.com"));
 
     // Map {
     //   "example" => Map {
     //     "" => Map {
     //       { text: "||example.com^$~third-party" } => true,
     //       { text: "/example/*$~third-party" } => true
     //     }
     //   }
     // }
     matcher.add(Filter.fromText("/example/*$~third-party"));
 
     assert.equal(matcher._blacklist._filterDomainMapsByKeyword.size, 1);
 
     for (let [key, value] of matcher._blacklist._filterDomainMapsByKeyword)
     {
       assert.equal(key, "example");
       assert.equal(value.size, 1);
 
       let map = value.get("");
       assert.equal(map.size, 2);
       assert.equal(map.get(Filter.fromText("||example.com^$~third-party")), true);
       assert.equal(map.get(Filter.fromText("/example/*$~third-party")), true);
 
       break;
     }
 
-    assert.ok(!!matcher.matchesAny("https://example.com/example/image.jpg",
-                                   RegExpFilter.typeMap.IMAGE, "example.com",
-                                   false));
+    assert.ok(!!matcher.matchesAny(parseURL("https://example.com/example/ad.jpg"),
+                                   RegExpFilter.typeMap.IMAGE, "example.com"));
 
     // Map { "example" => { text: "/example/*$~third-party" } }
     matcher.remove(Filter.fromText("||example.com^$~third-party"));
 
     assert.equal(matcher._blacklist._filterDomainMapsByKeyword.size, 1);
 
     for (let [key, value] of matcher._blacklist._filterDomainMapsByKeyword)
     {
       assert.equal(key, "example");
       assert.deepEqual(value, Filter.fromText("/example/*$~third-party"));
       break;
     }
 
-    assert.ok(!!matcher.matchesAny("https://example.com/example/image.jpg",
-                                   RegExpFilter.typeMap.IMAGE, "example.com",
-                                   false));
+    assert.ok(!!matcher.matchesAny(parseURL("https://example.com/example/ad.jpg"),
+                                   RegExpFilter.typeMap.IMAGE, "example.com"));
 
     // Map {}
     matcher.remove(Filter.fromText("/example/*$~third-party"));
 
     assert.equal(matcher._blacklist._filterDomainMapsByKeyword.size, 0);
 
-    assert.ok(!matcher.matchesAny("https://example.com/example/image.jpg",
-                                  RegExpFilter.typeMap.IMAGE, "example.com",
-                                  false));
+    assert.ok(!matcher.matchesAny(parseURL("https://example.com/example/ad.jpg"),
+                                  RegExpFilter.typeMap.IMAGE, "example.com"));
   });
 });