Issue 7094 - Encapsulate management of subscription filters

test/synchronizer.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";
 
 let {
   createSandbox, setupTimerAndXMLHttp, setupRandomResult, unexpectedError, Cr,
   MILLIS_IN_SECOND, MILLIS_IN_HOUR
 } = require("./_common");
 
-let Filter = null;
 let filterStorage = null;
 let Prefs = null;
 let Subscription = null;
 
 exports.setUp = function(callback)
 {
   let globals = Object.assign({}, setupTimerAndXMLHttp.call(this),
     setupRandomResult.call(this));
 
   let sandboxedRequire = createSandbox({globals});
   (
-    {Filter} = sandboxedRequire("../lib/filterClasses"),
     {filterStorage} = sandboxedRequire("../lib/filterStorage"),
     {Prefs} = sandboxedRequire("./stub-modules/prefs"),
     {Subscription} = sandboxedRequire("../lib/subscriptionClasses"),
     sandboxedRequire("../lib/synchronizer")
   );
 
   callback();
 };
 
 function resetSubscription(subscription)
@@ skipping 88 matching lines @@
       return [Cr.NS_OK, 200, currentTest.header + "\n!Expires: 8 hours\nfoo\n!bar\n\n@@bas\n#bam"];
     });
 
     this.runScheduledTasks(2).then(() =>
     {
       test.equal(subscription.downloadStatus, currentTest.downloadStatus, "Download status");
       test.equal(subscription.requiredVersion, currentTest.requiredVersion, "Required version");
 
       if (currentTest.downloadStatus == "synchronize_ok")
       {
-        test.deepEqual(subscription.filters, [
-          Filter.fromText("foo"),
-          Filter.fromText("!bar"),
-          Filter.fromText("@@bas"),
-          Filter.fromText("#bam")
-        ], "Resulting subscription filters");
+        test.deepEqual([...subscription.filterText()], ["foo", "!bar", "@@bas", "#bam"], "Resulting subscription filters");
       }
       else
       {
-        test.deepEqual(subscription.filters, [
+        test.deepEqual([...subscription.filterText()], [
         ], "Resulting subscription filters");
       }
     }).catch(unexpectedError.bind(test)).then(() => test.done());
   };
 }
 
 exports.testsDisabledUpdates = function(test)
 {
   Prefs.subscriptions_autoupdate = false;
 
@@ skipping 134 matching lines @@
     filterStorage.addSubscription(subscription);
 
     this.registerHandler("/subscription", metadata =>
     {
       return [Cr.NS_OK, 200, "[Adblock]\n" + comment + "\nfoo\nbar"];
     });
 
     this.runScheduledTasks(2).then(() =>
     {
       check(test, subscription);
-      test.deepEqual(subscription.filters, [Filter.fromText("foo"), Filter.fromText("bar")], "Special comment not added to filters");
+      test.deepEqual([...subscription.filterText()], ["foo", "bar"], "Special comment not added to filters");
     }).catch(unexpectedError.bind(test)).then(() => test.done());
   };
 }
 
 exports.testRedirects = function(test)
 {
   let subscription = Subscription.fromURL("http://example.com/subscription");
   filterStorage.addSubscription(subscription);
 
   this.registerHandler("/subscription", metadata =>
@@ skipping 182 matching lines @@
     return this.runScheduledTasks(24);
   }).then(() =>
   {
     test.equal(subscription.downloadStatus, "synchronize_connection_error", "downloadStatus after download error");
     test.equal(subscription.lastDownload * MILLIS_IN_SECOND, startTime + (26 + initialDelay) * MILLIS_IN_HOUR, "lastDownload after download error");
     test.equal(subscription.lastSuccess * MILLIS_IN_SECOND, startTime + initialDelay * MILLIS_IN_HOUR, "lastSuccess after download error");
     test.equal(subscription.lastCheck * MILLIS_IN_SECOND, startTime + (27 + initialDelay) * MILLIS_IN_HOUR, "lastCheck after download error");
     test.equal(subscription.errors, 2, "errors after download error");
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };