Issue 6854 - Remove deprecated FilterNotifier methods

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 21 matching lines @@
   (
     {Filter} = sandboxedRequire("../lib/filterClasses"),
     {FilterNotifier} = sandboxedRequire("../lib/filterNotifier"),
     {FilterStorage} = sandboxedRequire("../lib/filterStorage"),
     {Subscription} = sandboxedRequire("../lib/subscriptionClasses")
   );
 
   callback();
 };
 
+function addListener(listener)
+{
+  let makeWrapper = name => (...args) => listener(name, ...args);
+
+  FilterNotifier.on("subscription.added", makeWrapper("subscription.added"));

[Manish Jethani, 2018/08/11 14:47:06]

Since there is no catch-all event (unlike FilterNotifier.triggerListeners),
we're listening for all the events that we are interested in here.

+  FilterNotifier.on("subscription.removed",
+                    makeWrapper("subscription.removed"));
+  FilterNotifier.on("subscription.moved", makeWrapper("subscription.moved"));
+
+  FilterNotifier.on("filter.added", makeWrapper("filter.added"));
+  FilterNotifier.on("filter.removed", makeWrapper("filter.removed"));
+  FilterNotifier.on("filter.moved", makeWrapper("filter.moved"));
+
+  FilterNotifier.on("filter.hitCount", makeWrapper("filter.hitCount"));
+  FilterNotifier.on("filter.lastHit", makeWrapper("filter.lastHit"));
+}
+
 function compareSubscriptionList(test, testMessage, list)
 {
   let result = FilterStorage.subscriptions.map(subscription => subscription.url);
   let expected = list.map(subscription => subscription.url);
   test.deepEqual(result, expected, testMessage);
 }
 
 function compareFiltersList(test, testMessage, list)
 {
   let result = FilterStorage.subscriptions.map(
@@ skipping 13 matching lines @@
 {
   let subscription1 = Subscription.fromURL("http://test1/");
   let subscription2 = Subscription.fromURL("http://test2/");
 
   let changes = [];
   function listener(action, subscription)
   {
     if (action.indexOf("subscription.") == 0)
       changes.push(action + " " + subscription.url);
   }
-  FilterNotifier.addListener(listener);
+  addListener(listener);
 
   compareSubscriptionList(test, "Initial state", []);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
   FilterStorage.addSubscription(subscription1);
   compareSubscriptionList(test, "Adding first subscription", [subscription1]);
   test.deepEqual(changes, ["subscription.added http://test1/"], "Received changes");
 
   changes = [];
@@ skipping 23 matching lines @@
   let subscription2 = Subscription.fromURL("http://test2/");
   FilterStorage.addSubscription(subscription1);
   FilterStorage.addSubscription(subscription2);
 
   let changes = [];
   function listener(action, subscription)
   {
     if (action.indexOf("subscription.") == 0)
       changes.push(action + " " + subscription.url);
   }
-  FilterNotifier.addListener(listener);
+  addListener(listener);
 
   compareSubscriptionList(test, "Initial state", [subscription1, subscription2]);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
   FilterStorage.removeSubscription(subscription1);
   compareSubscriptionList(test, "Removing first subscription", [subscription2]);
   test.deepEqual(changes, ["subscription.removed http://test1/"], "Received changes");
 
   changes = [];
@@ skipping 26 matching lines @@
   FilterStorage.addSubscription(subscription1);
   FilterStorage.addSubscription(subscription2);
   FilterStorage.addSubscription(subscription3);
 
   let changes = [];
   function listener(action, subscription)
   {
     if (action.indexOf("subscription.") == 0)
       changes.push(action + " " + subscription.url);
   }
-  FilterNotifier.addListener(listener);
+  addListener(listener);
 
   compareSubscriptionList(test, "Initial state", [subscription1, subscription2, subscription3]);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
   FilterStorage.moveSubscription(subscription1);
   compareSubscriptionList(test, "Move without explicit position", [subscription2, subscription3, subscription1]);
   test.deepEqual(changes, ["subscription.moved http://test1/"], "Received changes");
 
   changes = [];
@@ skipping 40 matching lines @@
   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);
   }
-  FilterNotifier.addListener(listener);
+  addListener(listener);
 
   compareFiltersList(test, "Initial state", [[], [], []]);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
   FilterStorage.addFilter(Filter.fromText("foo"));
   compareFiltersList(test, "Adding blocking filter", [["foo"], [], []]);
   test.deepEqual(changes, ["filter.added foo"], "Received changes");
 
   changes = [];
@@ skipping 55 matching lines @@
   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);
   }
-  FilterNotifier.addListener(listener);
+  addListener(listener);
 
   compareFiltersList(test, "Initial state", [["foo", "foo", "bar"], ["foo", "bar", "foo"], ["foo", "bar"]]);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
   FilterStorage.removeFilter(Filter.fromText("foo"), subscription2, 0);
   compareFiltersList(test, "Remove with explicit subscription and position", [["foo", "foo", "bar"], ["bar", "foo"], ["foo", "bar"]]);
   test.deepEqual(changes, ["filter.removed foo"], "Received changes");
 
   changes = [];
@@ skipping 34 matching lines @@
 
   FilterStorage.addSubscription(subscription1);
   FilterStorage.addSubscription(subscription2);
 
   let changes = [];
   function listener(action, filter)
   {
     if (action.indexOf("filter.") == 0)
       changes.push(action + " " + filter.text);
   }
-  FilterNotifier.addListener(listener);
+  addListener(listener);
 
   compareFiltersList(test, "Initial state", [["foo", "bar", "bas", "foo"], ["foo", "bar"]]);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
   FilterStorage.moveFilter(Filter.fromText("foo"), subscription1, 0, 1);
   compareFiltersList(test, "Regular move", [["bar", "foo", "bas", "foo"], ["foo", "bar"]]);
   test.deepEqual(changes, ["filter.moved foo"], "Received changes");
 
   changes = [];
@@ skipping 20 matching lines @@
 };
 
 exports.testHitCounts = function(test)
 {
   let changes = [];
   function listener(action, filter)
   {
     if (action.indexOf("filter.") == 0)
       changes.push(action + " " + filter.text);
   }
-  FilterNotifier.addListener(listener);
+  addListener(listener);
 
   let filter1 = Filter.fromText("filter1");
   let filter2 = Filter.fromText("filter2");
 
   FilterStorage.addFilter(filter1);
 
   test.equal(filter1.hitCount, 0, "filter1 initial hit count");
   test.equal(filter2.hitCount, 0, "filter2 initial hit count");
   test.equal(filter1.lastHit, 0, "filter1 initial last hit");
   test.equal(filter2.lastHit, 0, "filter2 initial last hit");
@@ skipping 81 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();
 };