Issue 6891 - Rename FilterNotifier to filterNotifier

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
  * 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";
 
 const {createSandbox} = require("./_common");
 
 let Filter = null;
-let FilterNotifier = null;
+let filterNotifier = null;
 let FilterStorage = null;
 let Subscription = null;
 
 exports.setUp = function(callback)
 {
   let sandboxedRequire = createSandbox();
 
   sandboxedRequire("../lib/filterListener");
   (
     {Filter} = sandboxedRequire("../lib/filterClasses"),
-    {FilterNotifier} = sandboxedRequire("../lib/filterNotifier"),
+    {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"));
-  FilterNotifier.on("subscription.removed",
+  filterNotifier.on("subscription.added", makeWrapper("subscription.added"));
+  filterNotifier.on("subscription.removed",
                     makeWrapper("subscription.removed"));
-  FilterNotifier.on("subscription.moved", makeWrapper("subscription.moved"));
+  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.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"));
+  filterNotifier.on("filter.hitCount", makeWrapper("filter.hitCount"));
+  filterNotifier.on("filter.lastHit", makeWrapper("filter.lastHit"));
 }
 
 function compareSubscriptionList(test, testMessage, list,
                                  knownSubscriptions = null)
 {
   let result = FilterStorage.subscriptions.map(subscription => subscription.url);
   let expected = list.map(subscription => subscription.url);
   test.deepEqual(result, expected, testMessage);
 
   if (knownSubscriptions)
@@ skipping 464 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();
 };