Issue 4223 - Migrate some more of adblockplustests

test/filterListener.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 sandboxedRequire = null;
 
 let FilterStorage = null;
 let Subscription = null;
 let Filter = null;
 let defaultMatcher = null;
 let SpecialSubscription = null;
 
 exports.setUp = function(callback)
 {
   sandboxedRequire = createSandbox({
     elemHide: ["filterByKey", "exceptions"],
     cssRules: ["filters"]
   });
 
   // We need to require the filterListener module so that filter changes will be
   // noticed, even though we don't directly use the module here.
-  sandboxedRequire("filterListener");
+  sandboxedRequire("../lib/filterListener");
 
   (
-    {FilterStorage} = sandboxedRequire("filterStorage"),
-    {Subscription, SpecialSubscription} = sandboxedRequire("subscriptionClasses"),
-    {Filter} = sandboxedRequire("filterClasses"),
-    {defaultMatcher} = sandboxedRequire("matcher")
+    {FilterStorage} = sandboxedRequire("../lib/filterStorage"),
+    {Subscription, SpecialSubscription} = sandboxedRequire("../lib/subscriptionClasses"),
+    {Filter} = sandboxedRequire("../lib/filterClasses"),
+    {defaultMatcher} = sandboxedRequire("../lib/matcher")
   );
 
   FilterStorage.addSubscription(Subscription.fromURL("~fl~"));
   FilterStorage.addSubscription(Subscription.fromURL("~wl~"));
   FilterStorage.addSubscription(Subscription.fromURL("~eh~"));
 
   Subscription.fromURL("~fl~").defaults = ["blocking"];
   Subscription.fromURL("~wl~").defaults = ["whitelist"];
   Subscription.fromURL("~eh~").defaults = ["elemhide"];
 
@@ skipping 14 matching lines @@
       {
         let filter = list[i];
         test.equal(matcher.getKeywordForFilter(filter), keyword,
                    "Keyword of filter " + filter.text);
         filters.push(filter.text);
       }
     }
     result[type] = filters;
   }
 
-  let elemHide = sandboxedRequire("elemHide");
+  let elemHide = sandboxedRequire("../lib/elemHide");
   result.elemhide = [];
   for (let key in elemHide.filterByKey)
     result.elemhide.push(elemHide.filterByKey[key].text);
 
   result.elemhideexception = [];
   for (let selector in elemHide.exceptions)
   {
     let list = elemHide.exceptions[selector];
     for (let exception of list)
       result.elemhideexception.push(exception.text);
   }
 
-  let cssRules = sandboxedRequire("cssRules");
+  let cssRules = sandboxedRequire("../lib/cssRules");
   result.cssrule = [];
   for (let filterText in cssRules.filters)
     result.cssrule.push(filterText);
 
   let types = ["blacklist", "whitelist", "elemhide", "elemhideexception",
                "cssrule"];
   for (let type of types)
   {
     if (!(type in expected))
       expected[type] = [];
@@ skipping 215 matching lines @@
   checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text, filter3.text], whitelist: [filter2.text]});
 
   FilterStorage.removeSubscription(subscription4);
   checkKnownFilters(test, "remove subscription from the list", {blacklist: [filter1.text]});
 
   subscription3.disabled = false;
   checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text], whitelist: [filter2.text]});
 
  test.done();
 };