Issue 7094 - Encapsulate management of subscription filters

test/filterStorage.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 54 matching lines @@
   if (knownSubscriptions)
   {
     test.deepEqual([...Subscription.knownSubscriptions.values()],
                    knownSubscriptions, testMessage);
   }
 }
 
 function compareFiltersList(test, testMessage, list)
 {
   let result = [...filterStorage.subscriptions()].map(
-    subscription => subscription.filters);
+    subscription => [...subscription.filterText()]);
   test.deepEqual(result, list, testMessage);
 }
 
 function compareFilterSubscriptions(test, testMessage, filter, list)
 {
   let result = [...filter.subscriptions()].map(subscription => subscription.url);
   let expected = list.map(subscription => subscription.url);
   test.deepEqual(result, expected, testMessage);
 }
 
@@ skipping 197 matching lines @@
   filterStorage.addFilter(Filter.fromText("!foobar"), subscription2, 0);
   compareFiltersList(test, "Adding filter to an explicit subscription with position", [["foo", "foo"], ["!foobar", "@@bar", "foo##bar", "foo#@#bar"], ["!foobar", "foo"]]);
   test.deepEqual(changes, ["filter.added !foobar"], "Received changes");
 
   test.done();
 };
 
 exports.testRemovingFilters = function(test)
 {
   let subscription1 = Subscription.fromURL("~foo");
-  subscription1.filters = ["foo", "foo", "bar"];
+  subscription1.addFilter(Filter.fromText("foo"));
+  subscription1.addFilter(Filter.fromText("foo"));
+  subscription1.addFilter(Filter.fromText("bar"));
 
   let subscription2 = Subscription.fromURL("~bar");
-  subscription2.filters = ["foo", "bar", "foo"];
+  subscription2.addFilter(Filter.fromText("foo"));
+  subscription2.addFilter(Filter.fromText("bar"));
+  subscription2.addFilter(Filter.fromText("foo"));
 
   let subscription3 = Subscription.fromURL("http://test/");
-  subscription3.filters = ["foo", "bar"];
+  subscription3.addFilter(Filter.fromText("foo"));
+  subscription3.addFilter(Filter.fromText("bar"));
 
   filterStorage.addSubscription(subscription1);
   filterStorage.addSubscription(subscription2);
   filterStorage.addSubscription(subscription3);
 
   let changes = [];
   function listener(action, filter)
   {
     if (action.indexOf("filter.") == 0)
       changes.push(action + " " + filter.text);
@@ skipping 32 matching lines @@
   filterStorage.removeFilter(Filter.fromText("bar"));
   compareFiltersList(test, "Remove of unknown filter", [[], ["foo"], ["foo", "bar"]]);
   test.deepEqual(changes, [], "Received changes");
 
   test.done();
 };
 
 exports.testMovingFilters = function(test)
 {
   let subscription1 = Subscription.fromURL("~foo");
-  subscription1.filters = ["foo", "bar", "bas", "foo"];
+  subscription1.addFilter(Filter.fromText("foo"));
+  subscription1.addFilter(Filter.fromText("bar"));
+  subscription1.addFilter(Filter.fromText("bas"));
+  subscription1.addFilter(Filter.fromText("foo"));
 
   let subscription2 = Subscription.fromURL("http://test/");
-  subscription2.filters = ["foo", "bar"];
+  subscription2.addFilter(Filter.fromText("foo"));
+  subscription2.addFilter(Filter.fromText("bar"));
 
   filterStorage.addSubscription(subscription1);
   filterStorage.addSubscription(subscription2);
 
   let changes = [];
   function listener(action, filter)
   {
     if (action.indexOf("filter.") == 0)
       changes.push(action + " " + filter.text);
   }
@@ skipping 77 matching lines @@
   test.done();
 };
 
 exports.testFilterSubscriptionRelationship = function(test)
 {
   let filter1 = Filter.fromText("filter1");
   let filter2 = Filter.fromText("filter2");
   let filter3 = Filter.fromText("filter3");
 
   let subscription1 = Subscription.fromURL("http://test1/");
-  subscription1.filters = [filter1.text, filter2.text];
+  subscription1.addFilter(filter1);
+  subscription1.addFilter(filter2);
 
   let subscription2 = Subscription.fromURL("http://test2/");
-  subscription2.filters = [filter2.text, filter3.text];
+  subscription2.addFilter(filter2);
+  subscription2.addFilter(filter3);
 
   let subscription3 = Subscription.fromURL("http://test3/");
-  subscription3.filters = [filter1.text, filter2.text, filter3.text];
+  subscription3.addFilter(filter1);
+  subscription3.addFilter(filter2);
+  subscription3.addFilter(filter3);
 
   compareFilterSubscriptions(test, "Initial filter1 subscriptions", filter1, []);
   compareFilterSubscriptions(test, "Initial filter2 subscriptions", filter2, []);
   compareFilterSubscriptions(test, "Initial filter3 subscriptions", filter3, []);
 
   filterStorage.addSubscription(subscription1);
 
   compareFilterSubscriptions(test, "filter1 subscriptions after adding http://test1/", filter1, [subscription1]);
   compareFilterSubscriptions(test, "filter2 subscriptions after adding http://test1/", filter2, [subscription1]);
   compareFilterSubscriptions(test, "filter3 subscriptions after adding http://test1/", filter3, []);
@@ skipping 29 matching lines @@
   compareFilterSubscriptions(test, "filter3 subscriptions after updating http://test3/ filters", filter3, [subscription2]);
 
   filterStorage.removeSubscription(subscription3);
 
   compareFilterSubscriptions(test, "filter1 subscriptions after removing http://test3/", filter1, []);
   compareFilterSubscriptions(test, "filter2 subscriptions after removing http://test3/", filter2, [subscription2]);
   compareFilterSubscriptions(test, "filter3 subscriptions after removing http://test3/", filter3, [subscription2]);
 
   test.done();
 };