Issue 4223 - Migrate some more of adblockplustests

test/filterStorage.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 = null;
+let {createSandbox} = require("./_common");
 
 let Filter = null;
 let FilterNotifier = null;
 let FilterStorage = null;
 let Subscription = null;
 
 exports.setUp = function(callback)
 {
-  sandboxedRequire = createSandbox();
-
-  sandboxedRequire("filterListener");
-
-  Filter = sandboxedRequire("filterClasses").Filter;
-  FilterNotifier = sandboxedRequire("filterNotifier").FilterNotifier;
-  FilterStorage = sandboxedRequire("filterStorage").FilterStorage;
-  Subscription = sandboxedRequire("subscriptionClasses").Subscription;
+  let sandboxedRequire = createSandbox();
+
+  sandboxedRequire("../lib/filterListener");
+  (
+    {Filter} = sandboxedRequire("../lib/filterClasses"),
+    {FilterNotifier} = sandboxedRequire("../lib/filterNotifier"),
+    {FilterStorage} = sandboxedRequire("../lib/filterStorage"),
+    {Subscription} = sandboxedRequire("../lib/subscriptionClasses")
+  );
 
   callback();
 };
 
 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);
 }
@@ skipping 443 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();
 };