Issue 698 - Added tests for $sitekey option

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 20 matching lines @@
             domains.push(filter.domains[domain] ? domain : "~" + domain);
       }
       result.push("domains=" + domains.sort().join("|"));
 
       if (filter instanceof RegExpFilter)
       {
         result.push("regexp=" + filter.regexp.source);
         result.push("contentType=" + filter.contentType);
         result.push("matchCase=" + filter.matchCase);
 
+        let sitekeys = filter.sitekeys || [];
+        result.push("sitekeys=" + sitekeys.sort().join("|"));

[Wladimir Palant, 2014/09/10 21:55:06]

sitekeys.sort() will have side-effects - it will actually sort filter.sitekeys.
You should create a copy of the original array: sitekeys.slice().sort()

[Thomas Greiner, 2014/12/11 14:33:55]

Done.

+
         result.push("thirdParty=" + filter.thirdParty);
         if (filter instanceof BlockingFilter)
         {
           result.push("type=filterlist");
           result.push("collapse=" + filter.collapse);
         }
         else if (filter instanceof WhitelistFilter)
         {
           result.push("type=whitelist");
         }
@@ skipping 35 matching lines @@
       addProperty("disabled", "false");
       addProperty("lastHit", "0");
       addProperty("hitCount", "0");
     }
     if (type == "whitelist" || type == "filterlist")
     {
       addProperty("contentType", 0x7FFFFFFF & ~(RegExpFilter.typeMap.ELEMHIDE | RegExpFilter.typeMap.POPUP));
       addProperty("matchCase", "false");
       addProperty("thirdParty", "null");
       addProperty("domains", "");
+      addProperty("sitekeys", "");
     }
     if (type == "filterlist")
     {
       addProperty("collapse", "null");
     }
     if (type == "elemhide" || type == "elemhideexception")
     {
       addProperty("selectorDomain", "");
       addProperty("domains", "");
     }
@@ skipping 101 matching lines @@
     compareFilter("@@|*asd|f*d**dd*|", ["type=whitelist", "text=@@|*asd|f*d**dd*|", "regexp=^.*asd\\|f.*d.*dd.*$", "contentType=" + defaultTypes]);
     compareFilter("@@dd[]{}$%<>&()d", ["type=whitelist", "text=@@dd[]{}$%<>&()d", "regexp=dd\\[\\]\\{\\}\\$\\%\\<\\>\\&\\(\\)d", "contentType=" + defaultTypes]);
   });
 
   test("Filter options", function()
   {
     compareFilter("bla$match-case,script,other,third-party,domain=foo.com", ["type=filterlist", "text=bla$match-case,script,other,third-party,domain=foo.com", "regexp=bla", "matchCase=true", "contentType=" + (t.SCRIPT | t.OTHER), "thirdParty=true", "domains=FOO.COM"]);
     compareFilter("bla$~match-case,~script,~other,~third-party,domain=~bar.com", ["type=filterlist", "text=bla$~match-case,~script,~other,~third-party,domain=~bar.com", "regexp=bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER) | t.DOCUMENT), "thirdParty=false", "domains=~BAR.COM"]);
     compareFilter("@@bla$match-case,script,other,third-party,domain=foo.com|bar.com|~bar.foo.com|~foo.bar.com", ["type=whitelist", "text=@@bla$match-case,script,other,third-party,domain=foo.com|bar.com|~bar.foo.com|~foo.bar.com", "regexp=bla", "matchCase=true", "contentType=" + (t.SCRIPT | t.OTHER), "thirdParty=true", "domains=BAR.COM|FOO.COM|~BAR.FOO.COM|~FOO.BAR.COM"]);
 
+    compareFilter("bla$match-case,script,other,third-party,sitekey=foo", ["type=filterlist", "text=bla$match-case,script,other,third-party,sitekey=foo", "regexp=bla", "matchCase=true", "contentType=" + (t.SCRIPT | t.OTHER), "thirdParty=true", "sitekeys=FOO"]);
+    compareFilter("@@bla$match-case,script,other,third-party,sitekey=foo|bar", ["type=whitelist", "text=@@bla$match-case,script,other,third-party,sitekey=foo|bar", "regexp=bla", "matchCase=true", "contentType=" + (t.SCRIPT | t.OTHER), "thirdParty=true", "sitekeys=BAR|FOO"]);

[Wladimir Palant, 2014/09/10 21:55:06]

It's ok to add the sitekey option to the tests above - the idea there was to
test all kinds of filter options at the same time. The second compareFilter()
call can be made without a sitekey option, then this is covered as well.

[Thomas Greiner, 2014/12/11 14:33:55]

Done.

+
     // background and image should be the same for backwards compatibility
     compareFilter("bla$image", ["type=filterlist", "text=bla$image", "regexp=bla", "contentType=" + (t.IMAGE)]);
     compareFilter("bla$background", ["type=filterlist", "text=bla$background", "regexp=bla", "contentType=" + (t.IMAGE)]);
     compareFilter("bla$~image", ["type=filterlist", "text=bla$~image", "regexp=bla", "contentType=" + (defaultTypes & ~t.IMAGE | t.DOCUMENT)]);
     compareFilter("bla$~background", ["type=filterlist", "text=bla$~background", "regexp=bla", "contentType=" + (defaultTypes & ~t.IMAGE | t.DOCUMENT)]);
 
     compareFilter("@@bla$~script,~other", ["type=whitelist", "text=@@bla$~script,~other", "regexp=bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER))]);
     compareFilter("@@http://bla$~script,~other", ["type=whitelist", "text=@@http://bla$~script,~other", "regexp=http\\:\\/\\/bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER) | t.DOCUMENT)]);
     compareFilter("@@|ftp://bla$~script,~other", ["type=whitelist", "text=@@|ftp://bla$~script,~other", "regexp=^ftp\\:\\/\\/bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER) | t.DOCUMENT)]);
     compareFilter("@@bla$~script,~other,document", ["type=whitelist", "text=@@bla$~script,~other,document", "regexp=bla", "contentType=" +  (defaultTypes & ~(t.SCRIPT | t.OTHER) | t.DOCUMENT)]);
@@ skipping 34 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"]);
   });
 })();