Issue 5153 - Simplify patterns.ini parsing

test/filterStorage.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 61 matching lines @@
     if (action.indexOf("subscription.") == 0)
       changes.push(action + " " + subscription.url);
   }
   FilterNotifier.addListener(listener);
 
   compareSubscriptionList(test, "Initial state", []);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
   FilterStorage.addSubscription(subscription1);
-  compareSubscriptionList(test, "Regular add", [subscription1]);
+  compareSubscriptionList(test, "Adding first subscription", [subscription1]);
   test.deepEqual(changes, ["subscription.added http://test1/"], "Received changes");
 
   changes = [];
   FilterStorage.addSubscription(subscription1);
   compareSubscriptionList(test, "Adding already added subscription", [subscription1]);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
-  FilterStorage.addSubscription(subscription2, true);
-  compareSubscriptionList(test, "Silent add", [subscription1, subscription2]);
-  test.deepEqual(changes, [], "Received changes");
+  FilterStorage.addSubscription(subscription2);
+  compareSubscriptionList(test, "Adding second", [subscription1, subscription2]);
+  test.deepEqual(changes, ["subscription.added http://test2/"], "Received changes");
 
   FilterStorage.removeSubscription(subscription1);
   compareSubscriptionList(test, "Remove", [subscription2]);
 
   changes = [];
   FilterStorage.addSubscription(subscription1);
   compareSubscriptionList(test, "Re-adding previously removed subscription", [subscription2, subscription1]);
   test.deepEqual(changes, ["subscription.added http://test1/"], "Received changes");
 
   test.done();
@@ skipping 12 matching lines @@
     if (action.indexOf("subscription.") == 0)
       changes.push(action + " " + subscription.url);
   }
   FilterNotifier.addListener(listener);
 
   compareSubscriptionList(test, "Initial state", [subscription1, subscription2]);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
   FilterStorage.removeSubscription(subscription1);
-  compareSubscriptionList(test, "Regular remove", [subscription2]);
+  compareSubscriptionList(test, "Removing first subscription", [subscription2]);
   test.deepEqual(changes, ["subscription.removed http://test1/"], "Received changes");
 
   changes = [];
   FilterStorage.removeSubscription(subscription1);
   compareSubscriptionList(test, "Removing already removed subscription", [subscription2]);
   test.deepEqual(changes, [], "Received changes");
 
   changes = [];
-  FilterStorage.removeSubscription(subscription2, true);
-  compareSubscriptionList(test, "Silent remove", []);
-  test.deepEqual(changes, [], "Received changes");
+  FilterStorage.removeSubscription(subscription2);
+  compareSubscriptionList(test, "Removing remaining subscription", []);
+  test.deepEqual(changes, ["subscription.removed http://test2/"], "Received changes");
 
   FilterStorage.addSubscription(subscription1);
   compareSubscriptionList(test, "Add", [subscription1]);
 
   changes = [];
   FilterStorage.removeSubscription(subscription1);
   compareSubscriptionList(test, "Re-removing previously added subscription", []);
   test.deepEqual(changes, ["subscription.removed http://test1/"], "Received changes");
 
   test.done();
@@ skipping 95 matching lines @@
   FilterStorage.addFilter(Filter.fromText("foo#bar"));
   compareFiltersList(test, "Adding hiding rule", [["foo"], ["@@bar", "foo#bar"], []]);
   test.deepEqual(changes, ["filter.added foo#bar"], "Received changes");
 
   changes = [];
   FilterStorage.addFilter(Filter.fromText("foo#@#bar"));
   compareFiltersList(test, "Adding hiding exception", [["foo"], ["@@bar", "foo#bar", "foo#@#bar"], []]);
   test.deepEqual(changes, ["filter.added foo#@#bar"], "Received changes");
 
   changes = [];
-  FilterStorage.addFilter(Filter.fromText("!foobar"), undefined, undefined, true);
-  compareFiltersList(test, "Adding comment silent", [["foo"], ["@@bar", "foo#bar", "foo#@#bar"], ["!foobar"]]);
-  test.deepEqual(changes, [], "Received changes");
+  FilterStorage.addFilter(Filter.fromText("!foobar"));
+  compareFiltersList(test, "Adding comment", [["foo"], ["@@bar", "foo#bar", "foo#@#bar"], ["!foobar"]]);
+  test.deepEqual(changes, ["filter.added !foobar"], "Received changes");
 
   changes = [];
   FilterStorage.addFilter(Filter.fromText("foo"));
   compareFiltersList(test, "Adding already added filter", [["foo"], ["@@bar", "foo#bar", "foo#@#bar"], ["!foobar"]]);
   test.deepEqual(changes, [], "Received changes");
 
   subscription1.disabled = true;
 
   changes = [];
   FilterStorage.addFilter(Filter.fromText("foo"));
@@ skipping 225 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();
 };