Issue 2394 - Added unit tests for CSS property filters

chrome/content/tests/filterListener.js

 (function()
 {
   module("Filter listener", {
     setup: function()
     {
       prepareFilterComponents.call(this, true);
       preparePrefs.call(this);
 
       FilterStorage.addSubscription(Subscription.fromURL("~fl~"));
       FilterStorage.addSubscription(Subscription.fromURL("~wl~"));
@@ skipping 32 matching lines @@
 
     let ElemHideGlobal = getModuleGlobal("elemHide");
     result.elemhide = [];
     for (let key in ElemHideGlobal.filterByKey)
       result.elemhide.push(ElemHideGlobal.filterByKey[key].text);
 
     result.elemhideexception = [];
     for (let selector in ElemHideGlobal.exceptions)
     {
       let list = ElemHideGlobal.exceptions[selector];
-      for (let i = 0; i < list.length; i++)
-        result.elemhideexception.push(list[i].text);
+      for (let exception of list)
+        result.elemhideexception.push(exception.text);
     }
 
-    for (let type of ["blacklist", "whitelist", "elemhide", "elemhideexception"])
+    let CSSRulesGlobal = getModuleGlobal("cssRules");
+    result.cssrule = [];
+    for (let key in CSSRulesGlobal.filters)
+    {
+      let filter = Filter.fromText(key);
+      result.cssrule.push(filter.text);

[Wladimir Palant, 2015/12/04 13:09:48]

This is an unnecessary roundtrip - result.cssrule.push(key) will do.

[Thomas Greiner, 2015/12/07 17:29:26]

Done.

+    }
+
+    let types = ["blacklist", "whitelist", "elemhide", "elemhideexception",
+      "cssrule"];
+    for (let type of types)
       if (!(type in expected))
         expected[type] = [];
 
     deepEqual(result, expected, text);
   }
 
   test("Adding and removing filters", function()
   {
     let filter1 = Filter.fromText("filter1");
     let filter2 = Filter.fromText("@@filter2");
     let filter3 = Filter.fromText("#filter3");
     let filter4 = Filter.fromText("!filter4");
     let filter5 = Filter.fromText("#@#filter5");
+    let filter6 = Filter.fromText("example.com##[-abp-properties='filter6']");
+    let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']");
 
     FilterStorage.addFilter(filter1);
     checkKnownFilters("add filter1", {blacklist: [filter1.text]});
     FilterStorage.addFilter(filter2);
     checkKnownFilters("add @@filter2", {blacklist: [filter1.text], whitelist: [filter2.text]});
     FilterStorage.addFilter(filter3);
     checkKnownFilters("add #filter3", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text]});
     FilterStorage.addFilter(filter4);
     checkKnownFilters("add !filter4", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text]});
     FilterStorage.addFilter(filter5);
     checkKnownFilters("add #@#filter5", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text]});
+    FilterStorage.addFilter(filter6);
+    checkKnownFilters("add example.com##[-abp-properties='filter6']", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text], cssrule: [filter6.text]});
+    FilterStorage.addFilter(filter7);
+    checkKnownFilters("add example.com#@#[-abp-properties='filter7']", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], cssrule: [filter6.text]});
 
     FilterStorage.removeFilter(filter1);
-    checkKnownFilters("remove filter1", {whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text]});
+    checkKnownFilters("remove filter1", {whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], cssrule: [filter6.text]});
     filter2.disabled = true;
-    checkKnownFilters("disable filter2", {elemhide: [filter3.text], elemhideexception: [filter5.text]});
+    checkKnownFilters("disable filter2", {elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], cssrule: [filter6.text]});
     FilterStorage.removeFilter(filter2);
-    checkKnownFilters("remove filter2", {elemhide: [filter3.text], elemhideexception: [filter5.text]});
+    checkKnownFilters("remove filter2", {elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], cssrule: [filter6.text]});
     FilterStorage.removeFilter(filter4);
-    checkKnownFilters("remove filter4", {elemhide: [filter3.text], elemhideexception: [filter5.text]});
+    checkKnownFilters("remove filter4", {elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], cssrule: [filter6.text]});
   });
 
   test("Disabling/enabling filters not in the list", function()
   {
     let filter1 = Filter.fromText("filter1");
     let filter2 = Filter.fromText("@@filter2");
     let filter3 = Filter.fromText("#filter3");
     let filter4 = Filter.fromText("#@#filter4");
+    let filter5 = Filter.fromText("example.com##[-abp-properties='filter5']");
+    let filter6 = Filter.fromText("example.com#@#[-abp-properties='filter6']");
 
     filter1.disabled = true;
     checkKnownFilters("disable filter1 while not in list", {});
     filter1.disabled = false;
     checkKnownFilters("enable filter1 while not in list", {});
 
     filter2.disabled = true;
     checkKnownFilters("disable @@filter2 while not in list", {});
     filter2.disabled = false;
     checkKnownFilters("enable @@filter2 while not in list", {});
 
     filter3.disabled = true;
     checkKnownFilters("disable #filter3 while not in list", {});
     filter3.disabled = false;
     checkKnownFilters("enable #filter3 while not in list", {});
 
     filter4.disabled = true;
     checkKnownFilters("disable #@#filter4 while not in list", {});
     filter4.disabled = false;
     checkKnownFilters("enable #@#filter4 while not in list", {});
+
+    filter5.disabled = true;
+    checkKnownFilters("disable example.com##[-abp-properties='filter5'] while not in list", {});
+    filter5.disabled = false;
+    checkKnownFilters("enable example.com##[-abp-properties='filter5'] while not in list", {});
+
+    filter6.disabled = true;
+    checkKnownFilters("disable example.com#@#[-abp-properties='filter6'] while not in list", {});
+    filter6.disabled = false;
+    checkKnownFilters("enable example.com#@#[-abp-properties='filter6'] while not in list", {});
   });
 
   test("Filter subscription operations", function()
   {
     let filter1 = Filter.fromText("filter1");
     let filter2 = Filter.fromText("@@filter2");
     filter2.disabled = true;
     let filter3 = Filter.fromText("#filter3");
     let filter4 = Filter.fromText("!filter4");
     let filter5 = Filter.fromText("#@#filter5");
+    let filter6 = Filter.fromText("example.com##[-abp-properties='filter6']");
+    let filter7 = Filter.fromText("example.com#@#[-abp-properties='filter7']");
 
     let subscription = Subscription.fromURL("http://test1/");
-    subscription.filters = [filter1, filter2, filter3, filter4, filter5];
+    subscription.filters = [filter1, filter2, filter3, filter4, filter5, filter6, filter7];
 
     FilterStorage.addSubscription(subscription);
-    checkKnownFilters("add subscription with filter1, @@filter2, #filter3, !filter4, #@#filter5", {blacklist: [filter1.text], elemhide: [filter3.text], elemhideexception: [filter5.text]});
+    checkKnownFilters("add subscription with filter1, @@filter2, #filter3, !filter4, #@#filter5, example.com##[-abp-properties='filter6'], example.com#@#[-abp-properties='filter7']", {blacklist: [filter1.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], cssrule: [filter6.text]});
 
     filter2.disabled = false;
-    checkKnownFilters("enable @@filter2", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text]});
+    checkKnownFilters("enable @@filter2", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], cssrule: [filter6.text]});
 
     FilterStorage.addFilter(filter1);
-    checkKnownFilters("add filter1", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text]});
+    checkKnownFilters("add filter1", {blacklist: [filter1.text], whitelist: [filter2.text], elemhide: [filter3.text], elemhideexception: [filter5.text, filter7.text], cssrule: [filter6.text]});
 
     FilterStorage.updateSubscriptionFilters(subscription, [filter4]);
     checkKnownFilters("change subscription filters to filter4", {blacklist: [filter1.text]});
 
     FilterStorage.removeFilter(filter1);
     checkKnownFilters("remove filter1", {});
 
     FilterStorage.updateSubscriptionFilters(subscription, [filter1, filter2]);
     checkKnownFilters("change subscription filters to filter1, filter2", {blacklist: [filter1.text], whitelist: [filter2.text]});
 
@@ skipping 93 matching lines @@
     subscription3.disabled = true;
     checkKnownFilters("disable exception rules", {blacklist: [filter1.text, filter3.text], whitelist: [filter2.text]});
 
     FilterStorage.removeSubscription(subscription4);
     checkKnownFilters("remove subscription from the list", {blacklist: [filter1.text]});
 
     subscription3.disabled = false;
     checkKnownFilters("enable exception rules", {blacklist: [filter1.text], whitelist: [filter2.text]});
   });
 })();