Issue 6820 - Move tests to mocha

test/regexpFilters_matching.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 URLRequest = null;
 
 describe("Regexp filters matching", () =>
 {
   beforeEach(() =>
   {
     let sandboxedRequire = createSandbox();
     (
-      {Filter, RegExpFilter} = sandboxedRequire("../lib/filterClasses")
+      {Filter, RegExpFilter} = sandboxedRequire("../lib/filterClasses"),
+      {URLRequest} = sandboxedRequire("../lib/url")
     );
   });
 
   function testMatch(text, location, contentType, docDomain, thirdParty, sitekey, expected)
   {
+    if (thirdParty && docDomain == null)
+      docDomain = "some-other-domain";
+
     function testMatchInternal(filterText)
     {
       let filter = Filter.fromText(filterText);
-      let result = filter.matches(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty, sitekey);
+      let request = URLRequest.from(location, docDomain);
+      let result = filter.matches(request, RegExpFilter.typeMap[contentType], sitekey);
       assert.equal(!!result, expected, '"' + filterText + '".matches(' + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ")");
     }
 
     testMatchInternal(text);
     if (!/^@@/.test(text))
       testMatchInternal("@@" + text);
   }
 
   it("Basic Filters", () =>
   {
@@ skipping 291 matching lines @@
     testMatch("@@test$~image,document", "http://test/", "DOCUMENT", null, false, null, true);
     testMatch("@@test$document,~image", "http://test/", "DOCUMENT", null, false, null, true);
     testMatch("@@test$document,domain=foo.com", "http://test/", "DOCUMENT", "foo.com", false, null, true);
     testMatch("@@test$document,domain=foo.com", "http://test/", "DOCUMENT", "bar.com", false, null, false);
     testMatch("@@test$document,domain=~foo.com", "http://test/", "DOCUMENT", "foo.com", false, null, false);
     testMatch("@@test$document,domain=~foo.com", "http://test/", "DOCUMENT", "bar.com", false, null, true);
     testMatch("@@test$document,sitekey=foo-publickey", "http://test/", "DOCUMENT", "foo.com", false, "foo-publickey", true);
     testMatch("@@test$document,sitekey=foo-publickey", "http://test/", "DOCUMENT", "foo.com", false, null, false);
   });
 });