Issue 7094 - Encapsulate management of subscription filters

test/filterStorage_readwrite.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 90 matching lines @@
     return filterStorage.loadFromDisk();
   }).then(() =>
   {
     test.ok(filterStorage.initialized, "Initialize after the first load");
     test.equal(filterStorage.fileProperties.version, filterStorage.formatVersion, "File format version");
 
     if (withExternal)
     {
       {
         let subscription = new ExternalSubscription("~external~external subscription ID", "External subscription");
-        subscription.filters = [Filter.fromText("foo"), Filter.fromText("bar")];
+        subscription.filters = ["foo", "bar"];
         filterStorage.addSubscription(subscription);
       }
 
       let externalSubscriptions = [...filterStorage.subscriptions()].filter(subscription => subscription instanceof ExternalSubscription);
       test.equal(externalSubscriptions.length, 1, "Number of external subscriptions after updateExternalSubscription");
 
       test.equal(externalSubscriptions[0].url, "~external~external subscription ID", "ID of external subscription");
       test.equal(externalSubscriptions[0].filters.length, 2, "Number of filters in external subscription");
     }
 
@@ skipping 141 matching lines @@
     return filterStorage.restoreBackup(1);
   }).then(() =>
   {
     test.equal([...filterStorage.subscriptions()][0].filters.length, 1, "Filter count after restoring backup");
     return filterStorage.loadFromDisk();
   }).then(() =>
   {
     test.equal([...filterStorage.subscriptions()][0].filters.length, 1, "Filter count after reloading");
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };