Issue 4223 - Migrate some more of adblockplustests

test/matcher.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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";
 
-let {createSandbox} = require("common");
+let {createSandbox} = require("./_common");
 
 let Filter = null;
 let RegExpFilter = null;
 let CombinedMatcher = null;
 let defaultMatcher = null;
 let Matcher = null;
 
 exports.setUp = function(callback)
 {
   let sandboxedRequire = createSandbox();
   (
-    {Filter, RegExpFilter} = sandboxedRequire("filterClasses"),
-    {CombinedMatcher, defaultMatcher, Matcher} = sandboxedRequire("matcher")
+    {Filter, RegExpFilter} = sandboxedRequire("../lib/filterClasses"),
+    {CombinedMatcher, defaultMatcher, Matcher} = sandboxedRequire("../lib/matcher")
   );
 
   callback();
 };
 
 function compareKeywords(test, text, expected)
 {
   for (let filter of [Filter.fromText(text), Filter.fromText("@@" + text)])
   {
     let matcher = new Matcher();
@@ skipping 195 matching lines @@
   cacheCheck(test, matcher, "http://fed", "IMAGE", null, true, "http://fed$third-party");
   cacheCheck(test, matcher, "http://abc_cba", "MEDIA", null, false, "cba$~third-party,~script");
   cacheCheck(test, matcher, "http://abc_cba", "MEDIA", null, true, "cba$third-party");
   cacheCheck(test, matcher, "http://abc_cba", "SCRIPT", null, false, "abc$script");
   cacheCheck(test, matcher, "http://def?http://fed", "MEDIA", null, false, "http://fed$~third-party,~script");
   cacheCheck(test, matcher, "http://def?http://fed", "MEDIA", null, true, "http://fed$third-party");
   cacheCheck(test, matcher, "http://def?http://fed", "SCRIPT", null, false, "http://def$script");
 
   test.done();
 };