Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: chrome/content/tests/filterClasses.js

Issue 29355735: Issue 4223 - Remove tests migrated to adblockpluscore (Closed)
Patch Set: Restored elemhide.js Created Oct. 4, 2016, 2:19 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/content/tests/domainRestrictions.js ('k') | chrome/content/tests/filterListener.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/content/tests/filterClasses.js
diff --git a/chrome/content/tests/filterClasses.js b/chrome/content/tests/filterClasses.js
deleted file mode 100644
index 3573465b9ff891da179b12b9642622b2080b4b14..0000000000000000000000000000000000000000
--- a/chrome/content/tests/filterClasses.js
+++ /dev/null
@@ -1,307 +0,0 @@
-(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)
- {
- result.push("type=invalid");
- if (filter.reason)
- result.push("reason=" + filter.reason);
- }
- else if (filter instanceof CommentFilter)
- {
- result.push("type=comment");
- }
- else if (filter instanceof ActiveFilter)
- {
- result.push("disabled=" + filter.disabled);
- result.push("lastHit=" + filter.lastHit);
- result.push("hitCount=" + filter.hitCount);
-
- let domains = [];
- if (filter.domains)
- {
- for (let domain in filter.domains)
- if (domain != "")
- 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.slice().sort().join("|"));
-
- 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");
- }
- }
- else if (filter instanceof ElemHideBase)
- {
- if (filter instanceof ElemHideFilter)
- result.push("type=elemhide");
- else if (filter instanceof ElemHideException)
- result.push("type=elemhideexception");
- else if (filter instanceof CSSPropertyFilter)
- {
- result.push("type=cssrule");
- result.push("prefix=" + (filter.selectorPrefix || ""));
- result.push("regexp=" + filter.regexpString);
- result.push("suffix=" + (filter.selectorSuffix || ""));
- }
-
- result.push("selectorDomain=" + (filter.selectorDomain || ""));
- result.push("selector=" + filter.selector);
- }
- }
- return result;
- }
-
- function addDefaults(expected)
- {
- let type = null;
- let hasProperty = {};
- for (let entry of expected)
- {
- if (/^type=(.*)/.test(entry))
- type = RegExp.$1;
- else if (/^(\w+)/.test(entry))
- hasProperty[RegExp.$1] = true;
- }
-
- function addProperty(prop, value)
- {
- if (!(prop in hasProperty))
- expected.push(prop + "=" + value);
- }
-
- if (type == "whitelist" || type == "filterlist" || type == "elemhide" || type == "elemhideexception" || type == "cssrule")
- {
- 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 | 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" || type == "cssrule")
- {
- addProperty("selectorDomain", "");
- addProperty("domains", "");
- }
- if (type == "cssrule")
- {
- addProperty("regexp", "");
- addProperty("prefix", "");
- addProperty("suffix", "");
- }
- }
-
- function compareFilter(text, expected, postInit)
- {
- addDefaults(expected);
-
- let filter = Filter.fromText(text);
- if (postInit)
- postInit(filter)
- let result = serializeFilter(filter);
- equal(result.sort().join("\n"), expected.sort().join("\n"), text);
-
- // Test round-trip
- let filter2;
- let buffer = [];
- filter.serialize(buffer);
- if (buffer.length)
- {
- let map = Object.create(null);
- for (let line of buffer.slice(1))
- {
- if (/(.*?)=(.*)/.test(line))
- map[RegExp.$1] = RegExp.$2;
- }
- filter2 = Filter.fromObject(map);
- }
- else
- {
- filter2 = Filter.fromText(filter.text);
- }
-
- equal(serializeFilter(filter).join("\n"), serializeFilter(filter2).join("\n"), text + " deserialization");
- }
-
- test("Filter class definitions", function()
- {
- equal(typeof Filter, "function", "typeof Filter");
- equal(typeof InvalidFilter, "function", "typeof InvalidFilter");
- equal(typeof CommentFilter, "function", "typeof CommentFilter");
- equal(typeof ActiveFilter, "function", "typeof ActiveFilter");
- equal(typeof RegExpFilter, "function", "typeof RegExpFilter");
- equal(typeof BlockingFilter, "function", "typeof BlockingFilter");
- equal(typeof WhitelistFilter, "function", "typeof WhitelistFilter");
- equal(typeof ElemHideBase, "function", "typeof ElemHideBase");
- equal(typeof ElemHideFilter, "function", "typeof ElemHideFilter");
- equal(typeof ElemHideException, "function", "typeof ElemHideException");
- equal(typeof CSSPropertyFilter, "function", "typeof CSSPropertyFilter");
- });
-
- test("Comments", function()
- {
- compareFilter("!asdf", ["type=comment", "text=!asdf"]);
- compareFilter("!foo#bar", ["type=comment", "text=!foo#bar"]);
- compareFilter("!foo##bar", ["type=comment", "text=!foo##bar"]);
- });
-
- test("Invalid filters", function()
- {
- compareFilter("/??/", ["type=invalid", "text=/??/", "reason=filter_invalid_regexp"]);
- compareFilter("#dd(asd)(ddd)", ["type=invalid", "text=#dd(asd)(ddd)", "reason=filter_elemhide_duplicate_id"]);
- compareFilter("#*", ["type=invalid", "text=#*", "reason=filter_elemhide_nocriteria"]);
-
- function compareCSSRule(domains)
- {
- let filterText = domains + "##[-abp-properties='abc']";
- compareFilter(filterText, ["type=invalid", "text=" + filterText, "reason=filter_cssproperty_nodomain"]);
- }
- compareCSSRule("");
- compareCSSRule("~foo.com");
- compareCSSRule("~foo.com,~bar.com");
- compareCSSRule("foo");
- compareCSSRule("~foo.com,bar");
- });
-
- test("Filters with state", function()
- {
- compareFilter("blabla", ["type=filterlist", "text=blabla", "regexp=blabla"]);
- compareFilter("blabla_default", ["type=filterlist", "text=blabla_default", "regexp=blabla_default"], function(filter)
- {
- filter.disabled = false;
- filter.hitCount = 0;
- filter.lastHit = 0;
- });
- 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 | 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]);
- 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,sitekey=foo", ["type=filterlist", "text=bla$match-case,script,other,third-party,domain=foo.com,sitekey=foo", "regexp=bla", "matchCase=true", "contentType=" + (t.SCRIPT | t.OTHER), "thirdParty=true", "domains=FOO.COM", "sitekeys=FOO"]);
- 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)), "thirdParty=false", "domains=~BAR.COM"]);
- compareFilter("@@bla$match-case,script,other,third-party,domain=foo.com|bar.com|~bar.foo.com|~foo.bar.com,sitekey=foo|bar", ["type=whitelist", "text=@@bla$match-case,script,other,third-party,domain=foo.com|bar.com|~bar.foo.com|~foo.bar.com,sitekey=foo|bar", "regexp=bla", "matchCase=true", "contentType=" + (t.SCRIPT | t.OTHER), "thirdParty=true", "domains=BAR.COM|FOO.COM|~BAR.FOO.COM|~FOO.BAR.COM", "sitekeys=BAR|FOO"]);
-
- // 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)]);
- compareFilter("bla$~background", ["type=filterlist", "text=bla$~background", "regexp=bla", "contentType=" + (defaultTypes & ~t.IMAGE)]);
-
- 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))]);
- compareFilter("@@|ftp://bla$~script,~other", ["type=whitelist", "text=@@|ftp://bla$~script,~other", "regexp=^ftp\\:\\/\\/bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER))]);
- compareFilter("@@bla$~script,~other,document", ["type=whitelist", "text=@@bla$~script,~other,document", "regexp=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))]);
- compareFilter("@@bla$document", ["type=whitelist", "text=@@bla$document", "regexp=bla", "contentType=" + t.DOCUMENT]);
- compareFilter("@@bla$~script,~other,elemhide", ["type=whitelist", "text=@@bla$~script,~other,elemhide", "regexp=bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER) | t.ELEMHIDE)]);
- compareFilter("@@bla$~script,~other,~elemhide", ["type=whitelist", "text=@@bla$~script,~other,~elemhide", "regexp=bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER))]);
- compareFilter("@@bla$elemhide", ["type=whitelist", "text=@@bla$elemhide", "regexp=bla", "contentType=" + t.ELEMHIDE]);
-
- compareFilter("@@bla$~script,~other,donottrack", ["type=invalid", "text=@@bla$~script,~other,donottrack", "reason=filter_unknown_option"]);
- compareFilter("@@bla$~script,~other,~donottrack", ["type=invalid", "text=@@bla$~script,~other,~donottrack", "reason=filter_unknown_option"]);
- compareFilter("@@bla$donottrack", ["type=invalid", "text=@@bla$donottrack", "reason=filter_unknown_option"]);
- compareFilter("@@bla$foobar", ["type=invalid", "text=@@bla$foobar", "reason=filter_unknown_option"]);
- compareFilter("@@bla$image,foobar", ["type=invalid", "text=@@bla$image,foobar", "reason=filter_unknown_option"]);
- compareFilter("@@bla$foobar,image", ["type=invalid", "text=@@bla$foobar,image", "reason=filter_unknown_option"]);
- });
-
- test("Element hiding rules", function()
- {
- compareFilter("#ddd", ["type=elemhide", "text=#ddd", "selector=ddd"]);
- compareFilter("#ddd(fff)", ["type=elemhide", "text=#ddd(fff)", "selector=ddd.fff,ddd#fff"]);
- compareFilter("#ddd(foo=bar)(foo2^=bar2)(foo3*=bar3)(foo4$=bar4)", ["type=elemhide", "text=#ddd(foo=bar)(foo2^=bar2)(foo3*=bar3)(foo4$=bar4)", 'selector=ddd[foo="bar"][foo2^="bar2"][foo3*="bar3"][foo4$="bar4"]']);
- compareFilter("#ddd(fff)(foo=bar)", ["type=elemhide", "text=#ddd(fff)(foo=bar)", 'selector=ddd.fff[foo="bar"],ddd#fff[foo="bar"]']);
- compareFilter("#*(fff)", ["type=elemhide", "text=#*(fff)", "selector=.fff,#fff"]);
- compareFilter("#*(foo=bar)", ["type=elemhide", "text=#*(foo=bar)", 'selector=[foo="bar"]']);
- compareFilter("##body > div:first-child", ["type=elemhide", "text=##body > div:first-child", "selector=body > div:first-child"]);
- compareFilter("foo#ddd", ["type=elemhide", "text=foo#ddd", "selectorDomain=foo", "selector=ddd", "domains=FOO"]);
- compareFilter("foo,bar#ddd", ["type=elemhide", "text=foo,bar#ddd", "selectorDomain=foo,bar", "selector=ddd", "domains=BAR|FOO"]);
- compareFilter("foo,~bar#ddd", ["type=elemhide", "text=foo,~bar#ddd", "selectorDomain=foo", "selector=ddd", "domains=FOO|~BAR"]);
- compareFilter("foo,~baz,bar#ddd", ["type=elemhide", "text=foo,~baz,bar#ddd", "selectorDomain=foo,bar", "selector=ddd", "domains=BAR|FOO|~BAZ"]);
- });
-
- test("Element hiding exceptions", function()
- {
- compareFilter("#@ddd", ["type=elemhideexception", "text=#@ddd", "selector=ddd"]);
- compareFilter("#@ddd(fff)", ["type=elemhideexception", "text=#@ddd(fff)", "selector=ddd.fff,ddd#fff"]);
- compareFilter("#@ddd(foo=bar)(foo2^=bar2)(foo3*=bar3)(foo4$=bar4)", ["type=elemhideexception", "text=#@ddd(foo=bar)(foo2^=bar2)(foo3*=bar3)(foo4$=bar4)", 'selector=ddd[foo="bar"][foo2^="bar2"][foo3*="bar3"][foo4$="bar4"]']);
- 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"]);
- });
-
- test("CSS property filters", function()
- {
- // Check valid domain combinations
- compareFilter("foo.com##[-abp-properties='abc']", ["type=cssrule", "text=foo.com##[-abp-properties='abc']", "selectorDomain=foo.com", "selector=[-abp-properties='abc']", "domains=FOO.COM", "regexp=abc"]);
- compareFilter("foo.com,~bar.com##[-abp-properties='abc']", ["type=cssrule", "text=foo.com,~bar.com##[-abp-properties='abc']", "selectorDomain=foo.com", "selector=[-abp-properties='abc']", "domains=FOO.COM|~BAR.COM", "regexp=abc"]);
- compareFilter("foo.com,~bar##[-abp-properties='abc']", ["type=cssrule", "text=foo.com,~bar##[-abp-properties='abc']", "selectorDomain=foo.com", "selector=[-abp-properties='abc']", "domains=FOO.COM|~BAR", "regexp=abc"]);
- compareFilter("~foo.com,bar.com##[-abp-properties='abc']", ["type=cssrule", "text=~foo.com,bar.com##[-abp-properties='abc']", "selectorDomain=bar.com", "selector=[-abp-properties='abc']", "domains=BAR.COM|~FOO.COM", "regexp=abc"]);
-
- compareFilter("##[-abp-properties='']", ["type=elemhide", "text=##[-abp-properties='']", "selector=[-abp-properties='']"]);
- compareFilter("foo.com#@#[-abp-properties='abc']", ["type=elemhideexception", "text=foo.com#@#[-abp-properties='abc']", "selectorDomain=foo.com", "selector=[-abp-properties='abc']", "domains=FOO.COM"]);
- compareFilter("foo.com##aaa [-abp-properties='abc'] bbb", ["type=cssrule", "text=foo.com##aaa [-abp-properties='abc'] bbb", "selectorDomain=foo.com", "selector=aaa [-abp-properties='abc'] bbb", "domains=FOO.COM", "prefix=aaa ", "regexp=abc", "suffix= bbb"]);
- compareFilter("foo.com##[-abp-properties='|background-image: url(data:*)']", ["type=cssrule", "text=foo.com##[-abp-properties='|background-image: url(data:*)']", "selectorDomain=foo.com", "selector=[-abp-properties='|background-image: url(data:*)']", "domains=FOO.COM", "regexp=^background\\-image\\:\\ url\\(data\\:.*\\)"]);
- });
-})();
« no previous file with comments | « chrome/content/tests/domainRestrictions.js ('k') | chrome/content/tests/filterListener.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld