Issue 5052 - Adjust filter storage unit tests for API changes

test/filterStorage_readwrite.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 23 matching lines @@
   (
     {Filter} = sandboxedRequire("../lib/filterClasses"),
     {FilterNotifier} = sandboxedRequire("../lib/filterNotifier"),
     {FilterStorage} = sandboxedRequire("../lib/filterStorage"),
     {IO} = sandboxedRequire("./stub-modules/io"),
     {Prefs} = sandboxedRequire("./stub-modules/prefs"),
     {Subscription, ExternalSubscription} = sandboxedRequire("../lib/subscriptionClasses")
   );
 
   Prefs.patternsfile = "patterns.ini";
   dataFile = IO.resolveFilePath(Prefs.patternsfile);

[kzar, 2017/04/05 04:00:15]

Shouldn't dataFile be assigned inside the setUp function so that it's state is
fresh for each test?

[Wladimir Palant, 2017/04/05 07:14:24]

Isn't it? We are still inside setUp.

[kzar, 2017/04/05 10:08:58]

Argh sorry, so it is.

 
   FilterStorage.addFilter(Filter.fromText("foobar"));

[Wladimir Palant, 2017/04/04 12:11:16]

Calling FilterStorage.addFilter() has essentially the same effect as
FilterStorage.addSubscription() - it adds a subscription implicitly so the
storage isn't completely empty. The additional benefit is that this subscription
also has a filter so FilterStorage.importData() won't remove it.

[kzar, 2017/04/05 04:00:15]

Acknowledged.

   callback();
 };
 
 let testData = new Promise((resolve, reject) =>
 {
   const fs = require("fs");
   const path = require("path");
   let datapath = path.resolve(__dirname, "data", "patterns.ini");
 
   fs.readFile(datapath, "utf-8", (error, data) =>
@@ skipping 10 matching lines @@
   FilterStorage.loadFromDisk();
   return FilterNotifier.once("load");
 }
 
 function saveFilters()
 {
   FilterStorage.saveToDisk();
   return FilterNotifier.once("save");
 }
 
 function canonize(data)

[Wladimir Palant, 2017/04/04 12:11:16]

This function was merely moved so that it can be used by two tests.

[kzar, 2017/04/05 04:00:15]

Acknowledged.

 {
   let curSection = null;
   let sections = [];
   for (let line of (data + "\n[end]").split(/[\r\n]+/))
   {
     if (/^\[.*\]$/.test(line))
     {
       if (curSection)
         sections.push(curSection);
 
@@ skipping 212 matching lines @@
 
     test.ok(!backupFile3.exists(), "Third backup not created with patternsbackups = 2");
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };
 
 exports.testRestoringBackup = function(test)
 {
   Prefs.patternsbackups = 2;
   Prefs.patternsbackupinterval = 24;
 
-  let backupFile = dataFile.clone();
-  backupFile.leafName = backupFile.leafName.replace(/\.ini$/, "-backup1.ini");

[Wladimir Palant, 2017/04/04 12:11:16]

This variable is unused - I already removed it locally but won't update the
review yet in order to avoid unnecessary noise.

[kzar, 2017/04/05 04:00:15]

If the variable's unused I don't mind it if you delete it here too. Up to you
anyway.

-
   saveFilters().then(() =>
   {
     test.equal(FilterStorage.subscriptions.length, 1, "Initial subscription count");
     FilterStorage.removeSubscription(FilterStorage.subscriptions[0]);
     return saveFilters();
   }).then(() =>
   {
     return loadFilters();
   }).then(() =>
   {
     test.equal(FilterStorage.subscriptions.length, 0, "Subscription count after removing subscriptions and reloading");
     return FilterStorage.restoreBackup(1);
   }).then(() =>
   {
     test.equal(FilterStorage.subscriptions.length, 1, "Subscription count after restoring backup");
     return loadFilters();
   }).then(() =>
   {
     test.equal(FilterStorage.subscriptions.length, 1, "Subscription count after reloading");
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };