Issue 616 - Add tests for $generichide and $genericblock

chrome/content/tests/filterClasses.js

 (function()
 {
   module("Filter classes", {setup: prepareFilterComponents, teardown: restoreFilterComponents});
 
   function serializeFilter(filter)
   {
     // Filter serialization only writes out essential properties, need to do a full serialization here
     let result = [];
     result.push("text=" + filter.text);
     if (filter instanceof InvalidFilter)
@@ skipping 74 matching lines @@
     }
 
     if (type == "whitelist" || type == "filterlist" || type == "elemhide" || type == "elemhideexception")
     {
       addProperty("disabled", "false");
       addProperty("lastHit", "0");
       addProperty("hitCount", "0");
     }
     if (type == "whitelist" || type == "filterlist")
     {
-      addProperty("contentType", 0x7FFFFFFF & ~(RegExpFilter.typeMap.DOCUMENT | RegExpFilter.typeMap.ELEMHIDE | RegExpFilter.typeMap.POPUP));
+      addProperty("contentType", 0x7FFFFFFF & ~(RegExpFilter.typeMap.DOCUMENT | RegExpFilter.typeMap.ELEMHIDE | RegExpFilter.typeMap.POPUP |

[Thomas Greiner, 2015/10/01 16:12:04]

Detail: If you think that the 80 characters rule should not be applied here,
that's fine with me but the way it breaks now is suboptimal as shown below.

How it looks like without line wraps:

call(abc | def | ghi |
     jkl | mno);

How it looks like in an environment limited to 80 characters (e.g. Rietveld):

call(abc |
def | ghi |
     jkl
 | mno);

[kzar, 2015/10/02 10:19:28]

Most of these test files are pretty bad when it comes to following the 80
character rule and often it's probably for the best. I agree with you here
though, was no trouble to make it look a bit nicer. Done.

[Thomas Greiner, 2015/10/02 13:55:47]

Thanks, I appreciate that.

+                                                RegExpFilter.typeMap.GENERICHIDE | RegExpFilter.typeMap.GENERICBLOCK));
       addProperty("matchCase", "false");
       addProperty("thirdParty", "null");
       addProperty("domains", "");
       addProperty("sitekeys", "");
     }
     if (type == "filterlist")
     {
       addProperty("collapse", "null");
     }
     if (type == "elemhide" || type == "elemhideexception")
@@ skipping 84 matching lines @@
     });
     compareFilter("blabla_non_default", ["type=filterlist", "text=blabla_non_default", "regexp=blabla_non_default", "disabled=true", "hitCount=12", "lastHit=20"], function(filter)
     {
       filter.disabled = true;
       filter.hitCount = 12;
       filter.lastHit = 20;
     });
   });
 
   let t = RegExpFilter.typeMap;
-  let defaultTypes = 0x7FFFFFFF & ~(t.ELEMHIDE | t.DOCUMENT | t.POPUP);
+  let defaultTypes = 0x7FFFFFFF & ~(t.ELEMHIDE | t.DOCUMENT | t.POPUP | t.GENERICHIDE | t.GENERICBLOCK);
 
   test("Special characters", function()
   {
     compareFilter("/ddd|f?a[s]d/", ["type=filterlist", "text=/ddd|f?a[s]d/", "regexp=ddd|f?a[s]d"]);
     compareFilter("*asdf*d**dd*", ["type=filterlist", "text=*asdf*d**dd*", "regexp=asdf.*d.*dd"]);
     compareFilter("|*asd|f*d**dd*|", ["type=filterlist", "text=|*asd|f*d**dd*|", "regexp=^.*asd\\|f.*d.*dd.*$"]);
     compareFilter("dd[]{}$%<>&()d", ["type=filterlist", "text=dd[]{}$%<>&()d", "regexp=dd\\[\\]\\{\\}\\$\\%\\<\\>\\&\\(\\)d"]);
 
     compareFilter("@@/ddd|f?a[s]d/", ["type=whitelist", "text=@@/ddd|f?a[s]d/", "regexp=ddd|f?a[s]d", "contentType=" + defaultTypes]);
     compareFilter("@@*asdf*d**dd*", ["type=whitelist", "text=@@*asdf*d**dd*", "regexp=asdf.*d.*dd", "contentType=" + defaultTypes]);
@@ skipping 54 matching lines @@
     compareFilter("#@ddd(fff)(foo=bar)", ["type=elemhideexception", "text=#@ddd(fff)(foo=bar)", 'selector=ddd.fff[foo="bar"],ddd#fff[foo="bar"]']);
     compareFilter("#@*(fff)", ["type=elemhideexception", "text=#@*(fff)", "selector=.fff,#fff"]);
     compareFilter("#@*(foo=bar)", ["type=elemhideexception", "text=#@*(foo=bar)", 'selector=[foo="bar"]']);
     compareFilter("#@#body > div:first-child", ["type=elemhideexception", "text=#@#body > div:first-child", "selector=body > div:first-child"]);
     compareFilter("foo#@ddd", ["type=elemhideexception", "text=foo#@ddd", "selectorDomain=foo", "selector=ddd", "domains=FOO"]);
     compareFilter("foo,bar#@ddd", ["type=elemhideexception", "text=foo,bar#@ddd", "selectorDomain=foo,bar", "selector=ddd", "domains=BAR|FOO"]);
     compareFilter("foo,~bar#@ddd", ["type=elemhideexception", "text=foo,~bar#@ddd", "selectorDomain=foo", "selector=ddd", "domains=FOO|~BAR"]);
     compareFilter("foo,~baz,bar#@ddd", ["type=elemhideexception", "text=foo,~baz,bar#@ddd", "selectorDomain=foo,bar", "selector=ddd", "domains=BAR|FOO|~BAZ"]);
   });
 })();