Issue 7452 - Do not cache element hiding filter objects by default

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
@@ skipping 12 matching lines @@
 let filterStorage = null;
 let Subscription = null;
 let Filter = null;
 let defaultMatcher = null;
 let SpecialSubscription = null;
 
 exports.setUp = function(callback)
 {
   sandboxedRequire = createSandbox({
     extraExports: {
-      elemHide: ["knownFilters"],
+      elemHide: ["knownFilterText"],
       elemHideEmulation: ["filters"],
-      elemHideExceptions: ["knownExceptions"],
-      snippets: ["filters"]
+      elemHideExceptions: ["knownExceptions"]
     }
   });
 
   // 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"),
@@ skipping 30 matching lines @@
                      "Keyword of filter " + filter.text);
           filters.push(filter.text);
         }
       }
     }
     result[type] = filters;
   }
 
   let elemHide = sandboxedRequire("../lib/elemHide");
   result.elemhide = [];
-  for (let filterText of elemHide.knownFilters)
+  for (let filterText of elemHide.knownFilterText)
     result.elemhide.push(filterText);
 
   let elemHideExceptions = sandboxedRequire("../lib/elemHideExceptions");
   result.elemhideexception = [];
   for (let exception of elemHideExceptions.knownExceptions)
     result.elemhideexception.push(exception.text);
 
   let elemHideEmulation = sandboxedRequire("../lib/elemHideEmulation");
   result.elemhideemulation = [];
   for (let filter of elemHideEmulation.filters)
     result.elemhideemulation.push(filter.text);
 
-  let snippets = sandboxedRequire("../lib/snippets");
+  let {snippets} = sandboxedRequire("../lib/snippets");
   result.snippets = [];
-  for (let filter of snippets.filters)
+  for (let filter of snippets._filters)
     result.snippets.push(filter.text);
 
   let types = ["blacklist", "whitelist", "elemhide", "elemhideexception",
                "elemhideemulation", "snippets"];
   for (let type of types)
   {
     if (!(type in expected))
       expected[type] = [];
     else
       expected[type].sort();
@@ skipping 87 matching lines @@
   let filter1 = Filter.fromText("filter1");
   let filter2 = Filter.fromText("@@filter2");
   filter2.disabled = true;
   let filter3 = Filter.fromText("##filter3");
   let filter4 = Filter.fromText("!filter4");
   let filter5 = Filter.fromText("#@#filter5");
   let filter6 = Filter.fromText("example.com#?#:-abp-properties(filter6)");
   let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']");
 
   let subscription = Subscription.fromURL("http://test1/");
-  subscription.filters = [filter1, filter2, filter3, filter4, filter5, filter6, filter7];
+  subscription.addFilter(filter1);
+  subscription.addFilter(filter2);
+  subscription.addFilter(filter3);
+  subscription.addFilter(filter4);
+  subscription.addFilter(filter5);
+  subscription.addFilter(filter6);
+  subscription.addFilter(filter7);
 
   filterStorage.addSubscription(subscription);
   checkKnownFilters(test, "add subscription with filter1, @@filter2, ##filter3, !filter4, #@#filter5, example.com#?#:-abp-properties(filter6), example.com#@#[-abp-properties='filter7']", {blacklist: [filter1.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]});
 
   filter2.disabled = false;
   checkKnownFilters(test, "enable @@filter2", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]});
 
   filterStorage.addFilter(filter1);
   checkKnownFilters(test, "add filter1", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], elemhideemulation: [filter6.text]});
 
-  filterStorage.updateSubscriptionFilters(subscription, [filter4]);
+  filterStorage.updateSubscriptionFilters(subscription, [filter4.text]);
   checkKnownFilters(test, "change subscription filters to filter4", {blacklist: [filter1.text]});
 
   filterStorage.removeFilter(filter1);
   checkKnownFilters(test, "remove filter1", {});
 
-  filterStorage.updateSubscriptionFilters(subscription, [filter1, filter2]);
+  filterStorage.updateSubscriptionFilters(subscription, [filter1.text, filter2.text]);
   checkKnownFilters(test, "change subscription filters to filter1, filter2", {blacklist: [filter1.text], whitelist: [filter2.text]});
 
   filter1.disabled = true;
   checkKnownFilters(test, "disable filter1", {whitelist: [filter2.text]});
   filter2.disabled = true;
   checkKnownFilters(test, "disable filter2", {});
   filter1.disabled = false;
   filter2.disabled = false;
   checkKnownFilters(test, "enable filter1, filter2", {blacklist: [filter1.text], whitelist: [filter2.text]});
 
@@ skipping 32 matching lines @@
 
 exports.testFilterGroupOperations = function(test)
 {
   let filter1 = Filter.fromText("filter1");
   let filter2 = Filter.fromText("@@filter2");
   let filter3 = Filter.fromText("filter3");
   let filter4 = Filter.fromText("@@filter4");
   let filter5 = Filter.fromText("!filter5");
 
   let subscription = Subscription.fromURL("http://test1/");
-  subscription.filters = [filter1, filter2];
+  subscription.addFilter(filter1);
+  subscription.addFilter(filter2);
 
   filterStorage.addSubscription(subscription);
   filterStorage.addFilter(filter1);
   checkKnownFilters(test, "initial setup", {blacklist: [filter1.text], whitelist: [filter2.text]});
 
   let subscription2 = Subscription.fromURL("~fl~");
   subscription2.disabled = true;
   checkKnownFilters(test, "disable blocking filters", {blacklist: [filter1.text], whitelist: [filter2.text]});
 
   filterStorage.removeSubscription(subscription);
   checkKnownFilters(test, "remove subscription", {});
 
   subscription2.disabled = false;
   checkKnownFilters(test, "enable blocking filters", {blacklist: [filter1.text]});
 
   let subscription3 = Subscription.fromURL("~wl~");
   subscription3.disabled = true;
   checkKnownFilters(test, "disable exception rules", {blacklist: [filter1.text]});
 
   filterStorage.addFilter(filter2);
   checkKnownFilters(test, "add @@filter2", {blacklist: [filter1.text], whitelist: [filter2.text]});
-  test.equal(filter2.subscriptionCount, 1, "@@filter2.subscriptionCount");
-  test.ok([...filter2.subscriptions()][0] instanceof SpecialSubscription, "@@filter2 added to a new filter group");
-  test.ok([...filter2.subscriptions()][0] != subscription3, "@@filter2 filter group is not the disabled exceptions group");
+  test.equal([...filterStorage.subscriptions(filter2.text)].length, 1, "@@filter2 subscription count");
+  test.ok([...filterStorage.subscriptions(filter2.text)][0] instanceof SpecialSubscription, "@@filter2 added to a new filter group");
+  test.ok([...filterStorage.subscriptions(filter2.text)][0] != subscription3, "@@filter2 filter group is not the disabled exceptions group");
 
   subscription3.disabled = false;
   checkKnownFilters(test, "enable exception rules", {blacklist: [filter1.text], whitelist: [filter2.text]});
 
   filterStorage.removeFilter(filter2);
   filterStorage.addFilter(filter2);
   checkKnownFilters(test, "re-add @@filter2", {blacklist: [filter1.text], whitelist: [filter2.text]});
-  test.equal(filter2.subscriptionCount, 1, "@@filter2.subscriptionCount");
-  test.ok([...filter2.subscriptions()][0] == subscription3, "@@filter2 added to the default exceptions group");
+  test.equal([...filterStorage.subscriptions(filter2.text)].length, 1, "@@filter2 subscription count");
+  test.ok([...filterStorage.subscriptions(filter2.text)][0] == subscription3, "@@filter2 added to the default exceptions group");
 
   let subscription4 = Subscription.fromURL("http://test/");
-  filterStorage.updateSubscriptionFilters(subscription4, [filter3, filter4, filter5]);
+  filterStorage.updateSubscriptionFilters(subscription4, [filter3.text, filter4.text, filter5.text]);
   checkKnownFilters(test, "update subscription not in the list yet", {blacklist: [filter1.text], whitelist: [filter2.text]});
 
   filterStorage.addSubscription(subscription4);
   checkKnownFilters(test, "add subscription to the list", {blacklist: [filter1.text, filter3.text], whitelist: [filter2.text, filter4.text]});
 
-  filterStorage.updateSubscriptionFilters(subscription4, [filter3, filter2, filter5]);
+  filterStorage.updateSubscriptionFilters(subscription4, [filter3.text, filter2.text, filter5.text]);
   checkKnownFilters(test, "update subscription while in the list", {blacklist: [filter1.text, filter3.text], whitelist: [filter2.text]});
 
   subscription3.disabled = true;
   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();
 };
 
 exports.testSnippetFilters = function(test)
 {
   let filter1 = Filter.fromText("example.com#$#filter1");
   let filter2 = Filter.fromText("example.com#$#filter2");
   let filter3 = Filter.fromText("example.com#$#filter3");
 
   let subscription1 = Subscription.fromURL("http://test1/");
-  subscription1.filters = [filter1, filter2];
+  subscription1.addFilter(filter1);
+  subscription1.addFilter(filter2);
 
   filterStorage.addSubscription(subscription1);
   checkKnownFilters(test, "add subscription with filter1 and filter2", {});
 
   let subscription2 = Subscription.fromURL("http://test2/");
   subscription2.type = "circumvention";
-  subscription2.filters = [filter1];
+  subscription2.addFilter(filter1);
 
   filterStorage.addSubscription(subscription2);
   checkKnownFilters(test, "add subscription of type circumvention with filter1", {snippets: [filter1.text]});
 
   let subscription3 = Subscription.fromURL("~foo");
-  subscription3.filters = [filter2];
+  subscription3.addFilter(filter2);
 
   filterStorage.addSubscription(subscription3);
   checkKnownFilters(test, "add special subscription with filter2", {snippets: [filter1.text, filter2.text]});
 
   let subscription4 = Subscription.fromURL("https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt");
-  subscription4.filters = [filter3];
+  subscription4.addFilter(filter3);
 
   filterStorage.addSubscription(subscription4);
   checkKnownFilters(test, "add ABP anti-circumvention subscription with filter3", {snippets: [filter1.text, filter2.text, filter3.text]});
 
   test.done();
 };