Issue 4223 - Migrate some more of adblockplustests

test/filterNotifier.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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} = require("common");
-let sandboxedRequire = createSandbox();
+let {createSandbox} = require("./_common");
 
-let {FilterNotifier} = sandboxedRequire("filterNotifier");
+let FilterNotifier = null;
+
+exports.setUp = function(callback)
+{
+  let sandboxedRequire = createSandbox();
+  (
+    {FilterNotifier} = sandboxedRequire("../lib/filterNotifier")
+  );
+
+  callback();
+};
 
 let triggeredListeners = [];
 let listeners = [
   (action, item) => triggeredListeners.push(["listener1", action, item]),
   (action, item) => triggeredListeners.push(["listener2", action, item]),
   (action, item) => triggeredListeners.push(["listener3", action, item])
 ];
 
 function compareListeners(test, testDescription, list)
 {
@@ skipping 55 matching lines @@
   };
   let listener2 = listeners[1];
   FilterNotifier.addListener(listener1);
   FilterNotifier.addListener(listener2);
 
   compareListeners(test, "Initial call", [listener1, listener2]);
   compareListeners(test, "Subsequent calls", [listener2]);
 
   test.done();
 };