Issue 2394 - Added unit tests for CSS property filters

chrome/content/tests/cssRules.js

 (function()
 {
   module("CSS property filter", {
     setup: function()
     {
       prepareFilterComponents.call(this);
       preparePrefs.call(this);
     },
     teardown: function()
     {
@@ skipping 15 matching lines @@
 
     let result = CSSRules.getRulesForDomain(domain)
         .map((filter) => filter.text);
     deepEqual(result.sort(), expected.sort(), text);
 
     CSSRules.clear();
     ElemHide.clear();
   }
 
   let selectorTests = [
-    ["Return single filter for multiple domains", "www.example.com", ["www.example.com,example.com##[-abp-properties='foo']"], ["www.example.com,example.com##[-abp-properties='foo']"]],
-    // ["Return unique selectors from multiple filters", "www.example.com", ["www.example.com##[-abp-properties='foo']", "other.example.org,www.example.com##[-abp-properties='foo']"], ["[-abp-properties='foo']"]],

[Thomas Greiner, 2015/12/03 12:55:21]

Removed these ones because they can no longer apply since we switched from
comparing selectors to comparing filters.

+    ["Ignore generic filters", "example.com", ["##[-abp-properties='foo']", "example.com##[-abp-properties='foo']", "~example.com##[-abp-properties='foo']"], ["example.com##[-abp-properties='foo']"]],
     ["Ignore selectors with exceptions", "example.com", ["example.com##[-abp-properties='foo']", "example.com##[-abp-properties='bar']", "example.com#@#[-abp-properties='foo']"], ["example.com##[-abp-properties='bar']"]],
     ["Ignore filters that include parent domain but exclude subdomain", "www.example.com", ["~www.example.com,example.com##[-abp-properties='foo']"], []],
-    ["Ignore filters with parent domain if exception matches subdomain", "www.example.com", ["www.example.com#@#[-abp-properties='foo']", "example.com##[-abp-properties='foo']"], []]
+    ["Ignore filters with parent domain if exception matches subdomain", "www.example.com", ["www.example.com#@#[-abp-properties='foo']", "example.com##[-abp-properties='foo']"], []],
+    ["Ignore filters for other subdomain", "other.example.com", ["www.example.com##[-abp-properties='foo']", "other.example.com##[-abp-properties='foo']"], ["other.example.com##[-abp-properties='foo']"]]
   ];
 
   test("Domain restrictions", function()
   {
-    for (let selectorTest of selectorTests)
-      runSelectorTest(selectorTest);
+    selectorTests.forEach(runSelectorTest);
   });
-
-  let testObjectCount = 0;
-  function constructFilter(domain)
-  {
-    let selector = "filter_" + (++testObjectCount);
-    return Filter.fromText(domain + "##" + selector);
-  }
 
   function compareRules(text, domain, expected)
   {
     let result = CSSRules.getRulesForDomain(domain)
         .map((filter) => filter.text);
     expected = expected.map((filter) => filter.text);
     deepEqual(result.sort(), expected.sort(), text);
   }
 
   test("CSS property filters container", function()
   {
-    let genericFilter = constructFilter("");
-    let domainFilter = constructFilter("example.com");
-    let subdomainFilter = constructFilter("www.example.com");
-    let otherDomainFilter = constructFilter("other.example.com");
+    let domainFilter = Filter.fromText("example.com##filter1");
+    let subdomainFilter = Filter.fromText("www.example.com##filter2");
+    let otherDomainFilter = Filter.fromText("other.example.com##filter3");
 
-    CSSRules.add(genericFilter);
     CSSRules.add(domainFilter);
     CSSRules.add(subdomainFilter);
     CSSRules.add(otherDomainFilter);
     compareRules("Return all matching filters", "www.example.com",
-        [genericFilter, domainFilter, subdomainFilter]);
+        [domainFilter, subdomainFilter]);
+
+    CSSRules.remove(domainFilter);
+    compareRules("Return all matching filters after removing one",
+        "www.example.com", [subdomainFilter]);
 
     CSSRules.clear();
-    CSSRules.add(subdomainFilter);
-    CSSRules.add(otherDomainFilter);
-    compareRules("Don't match other subdomain", "www.example.com",
-        [subdomainFilter]);
+    compareRules("Return no filters after clearing", "www.example.com", []);
   });
 })();