Issue 6562 - Remove filter keys from the element hiding code

test/filterListener.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 {createSandbox} = require("./_common");
 let sandboxedRequire = null;
 
 let FilterStorage = null;
 let Subscription = null;
 let Filter = null;
 let defaultMatcher = null;
 let SpecialSubscription = null;
+let ElemHideException = null;
 
 exports.setUp = function(callback)
 {
   sandboxedRequire = createSandbox({
     extraExports: {
-      elemHide: ["filterByKey", "exceptions"],
+      elemHide: ["knownFilters"],
       elemHideEmulation: ["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("../lib/filterListener");
 
   (
     {FilterStorage} = sandboxedRequire("../lib/filterStorage"),
     {Subscription, SpecialSubscription} = sandboxedRequire("../lib/subscriptionClasses"),
-    {Filter} = sandboxedRequire("../lib/filterClasses"),
+    {Filter, ElemHideException} = 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 16 matching lines @@
         test.equal(matcher.getKeywordForFilter(filter), keyword,
                    "Keyword of filter " + filter.text);
         filters.push(filter.text);
       }
     }
     result[type] = filters;
   }
 
   let elemHide = sandboxedRequire("../lib/elemHide");
   result.elemhide = [];
-  for (let key in elemHide.filterByKey)
-    result.elemhide.push(elemHide.filterByKey[key].text);
-
   result.elemhideexception = [];
-  for (let [, list] of elemHide.exceptions)
+  for (let filter of elemHide.knownFilters.values())

[Manish Jethani, 2018/04/27 12:39:36]

Call .values is redundant here, but if you prefer it then it's fine.

[kzar, 2018/04/30 10:11:46]

Done.

   {
-    for (let exception of list)
-      result.elemhideexception.push(exception.text);
+    if (filter instanceof ElemHideException)
+      result.elemhideexception.push(filter.text);
+    else
+      result.elemhide.push(filter.text);
   }
 
   let elemHideEmulation = sandboxedRequire("../lib/elemHideEmulation");
   result.elemhideemulation = [];
   for (let filterText of elemHideEmulation.filters)
     result.elemhideemulation.push(filterText);
 
   let types = ["blacklist", "whitelist", "elemhide", "elemhideexception",
                "elemhideemulation"];
   for (let type of types)
@@ skipping 218 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();
 };