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

Unified Diff: chrome/content/tests/matcher.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/filterStorage.js ('k') | chrome/content/tests/regexpFilters_matching.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/content/tests/matcher.js
diff --git a/chrome/content/tests/matcher.js b/chrome/content/tests/matcher.js
deleted file mode 100644
index 2949a152b55d30746888690764611a0708d69210..0000000000000000000000000000000000000000
--- a/chrome/content/tests/matcher.js
+++ /dev/null
@@ -1,207 +0,0 @@
-(function()
-{
- module("Filter matcher", {setup: prepareFilterComponents, teardown: restoreFilterComponents});
-
- function compareKeywords(text, expected)
- {
- for (let filter of [Filter.fromText(text), Filter.fromText("@@" + text)])
- {
- let matcher = new Matcher();
- let result = [];
- for (let dummy of expected)
- {
- let keyword = matcher.findKeyword(filter);
- result.push(keyword);
- if (keyword)
- {
- let dummyFilter = Filter.fromText('^' + keyword + '^');
- dummyFilter.filterCount = Infinity;
- matcher.add(dummyFilter);
- }
- }
-
- equal(result.join(", "), expected.join(", "), "Keyword candidates for " + filter.text);
- }
- }
-
- function checkMatch(filters, location, contentType, docDomain, thirdParty, sitekey, specificOnly, expected)
- {
- let matcher = new Matcher();
- for (let filter of filters)
- matcher.add(Filter.fromText(filter));
-
- let result = matcher.matchesAny(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty, sitekey, specificOnly);
- if (result)
- result = result.text;
-
- equal(result, expected, "match(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ", " + (specificOnly ? "specificOnly" : "not-specificOnly") + ") with:\n" + filters.join("\n"));
-
- let combinedMatcher = new CombinedMatcher();
- for (let i = 0; i < 2; i++)
- {
- for (let filter of filters)
- combinedMatcher.add(Filter.fromText(filter));
-
- let result = combinedMatcher.matchesAny(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty, sitekey, specificOnly);
- if (result)
- result = result.text;
-
- equal(result, expected, "combinedMatch(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ", " + (specificOnly ? "specificOnly" : "not-specificOnly") + ") with:\n" + filters.join("\n"));
-
- // Generic whitelisting rules can match for specificOnly searches, so we
- // can't easily know which rule will match for these whitelisting tests
- if (specificOnly)
- continue;
-
- // For next run: add whitelisting filters for filters that aren't already
- filters = filters.map((text) => text.substr(0, 2) == "@@" ? text : "@@" + text);
- if (expected && expected.substr(0, 2) != "@@")
- expected = "@@" + expected;
- }
- }
-
- function cacheCheck(matcher, location, contentType, docDomain, thirdParty, expected)
- {
- let result = matcher.matchesAny(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty);
- if (result)
- result = result.text;
-
- equal(result, expected, "match(" + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ") with static filters");
- }
-
- test("Matcher class definitions", function()
- {
- equal(typeof Matcher, "function", "typeof Matcher");
- equal(typeof CombinedMatcher, "function", "typeof CombinedMatcher");
- equal(typeof defaultMatcher, "object", "typeof defaultMatcher");
- ok(defaultMatcher instanceof CombinedMatcher, "defaultMatcher is a CombinedMatcher instance");
- });
-
- test("Keyword extraction", function()
- {
- compareKeywords("*", []);
- compareKeywords("asdf", []);
- compareKeywords("/asdf/", []);
- compareKeywords("/asdf1234", []);
- compareKeywords("/asdf/1234", ["asdf"]);
- compareKeywords("/asdf/1234^", ["asdf", "1234"]);
- compareKeywords("/asdf/123456^", ["123456", "asdf"]);
- compareKeywords("^asdf^1234^56as^", ["asdf", "1234", "56as"]);
- compareKeywords("*asdf/1234^", ["1234"]);
- compareKeywords("|asdf,1234*", ["asdf"]);
- compareKeywords("||domain.example^", ["example", "domain"]);
- compareKeywords("&asdf=1234|", ["asdf", "1234"]);
- compareKeywords("^foo%2Ebar^", ["foo%2ebar"]);
- compareKeywords("^aSdF^1234", ["asdf"]);
- compareKeywords("_asdf_1234_", ["asdf", "1234"]);
- compareKeywords("+asdf-1234=", ["asdf", "1234"]);
- compareKeywords("/123^ad2&ad&", ["123", "ad2"]);
- compareKeywords("/123^ad2&ad$script,domain=example.com", ["123", "ad2"]);
- });
-
- test("Filter matching", function()
- {
- checkMatch([], "http://abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["abc"], "http://abc/def", "IMAGE", null, false, null, false, "abc");
- checkMatch(["abc", "ddd"], "http://abc/def", "IMAGE", null, false, null, false, "abc");
- checkMatch(["ddd", "abc"], "http://abc/def", "IMAGE", null, false, null, false, "abc");
- checkMatch(["ddd", "abd"], "http://abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["abc", "://abc/d"], "http://abc/def", "IMAGE", null, false, null, false, "://abc/d");
- checkMatch(["://abc/d", "abc"], "http://abc/def", "IMAGE", null, false, null, false, "://abc/d");
- checkMatch(["|http://"], "http://abc/def", "IMAGE", null, false, null, false, "|http://");
- checkMatch(["|http://abc"], "http://abc/def", "IMAGE", null, false, null, false, "|http://abc");
- checkMatch(["|abc"], "http://abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["|/abc/def"], "http://abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["/def|"], "http://abc/def", "IMAGE", null, false, null, false, "/def|");
- checkMatch(["/abc/def|"], "http://abc/def", "IMAGE", null, false, null, false, "/abc/def|");
- checkMatch(["/abc/|"], "http://abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["http://abc/|"], "http://abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["|http://abc/def|"], "http://abc/def", "IMAGE", null, false, null, false, "|http://abc/def|");
- checkMatch(["|/abc/def|"], "http://abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["|http://abc/|"], "http://abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["|/abc/|"], "http://abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["||example.com/abc"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||example.com/abc");
- checkMatch(["||com/abc/def"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||com/abc/def");
- checkMatch(["||com/abc"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||com/abc");
- checkMatch(["||mple.com/abc"], "http://example.com/abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["||.com/abc/def"], "http://example.com/abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["||http://example.com/"], "http://example.com/abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["||example.com/abc/def|"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||example.com/abc/def|");
- checkMatch(["||com/abc/def|"], "http://example.com/abc/def", "IMAGE", null, false, null, false, "||com/abc/def|");
- checkMatch(["||example.com/abc|"], "http://example.com/abc/def", "IMAGE", null, false, null, false, null);
- checkMatch(["abc", "://abc/d", "asdf1234"], "http://abc/def", "IMAGE", null, false, null, false, "://abc/d");
- checkMatch(["foo*://abc/d", "foo*//abc/de", "://abc/de", "asdf1234"], "http://abc/def", "IMAGE", null, false, null, false, "://abc/de");
- checkMatch(["abc$third-party", "abc$~third-party", "ddd"], "http://abc/def", "IMAGE", null, false, null, false, "abc$~third-party");
- checkMatch(["abc$third-party", "abc$~third-party", "ddd"], "http://abc/def", "IMAGE", null, true, null, false, "abc$third-party");
- checkMatch(["//abc/def$third-party", "//abc/def$~third-party", "//abc_def"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def$~third-party");
- checkMatch(["//abc/def$third-party", "//abc/def$~third-party", "//abc_def"], "http://abc/def", "IMAGE", null, true, null, false, "//abc/def$third-party");
- checkMatch(["abc$third-party", "abc$~third-party", "//abc/def"], "http://abc/def", "IMAGE", null, true, null, false, "//abc/def");
- checkMatch(["//abc/def", "abc$third-party", "abc$~third-party"], "http://abc/def", "IMAGE", null, true, null, false, "//abc/def");
- checkMatch(["abc$third-party", "abc$~third-party", "//abc/def$third-party"], "http://abc/def", "IMAGE", null, true, null, false, "//abc/def$third-party");
- checkMatch(["abc$third-party", "abc$~third-party", "//abc/def$third-party"], "http://abc/def", "IMAGE", null, false, null, false, "abc$~third-party");
- checkMatch(["abc$third-party", "abc$~third-party", "//abc/def$~third-party"], "http://abc/def", "IMAGE", null, true, null, false, "abc$third-party");
- checkMatch(["abc$image", "abc$script", "abc$~image"], "http://abc/def", "IMAGE", null, false, null, false, "abc$image");
- checkMatch(["abc$image", "abc$script", "abc$~script"], "http://abc/def", "SCRIPT", null, false, null, false, "abc$script");
- checkMatch(["abc$image", "abc$script", "abc$~image"], "http://abc/def", "OTHER", null, false, null, false, "abc$~image");
- checkMatch(["//abc/def$image", "//abc/def$script", "//abc/def$~image"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def$image");
- checkMatch(["//abc/def$image", "//abc/def$script", "//abc/def$~script"], "http://abc/def", "SCRIPT", null, false, null, false, "//abc/def$script");
- checkMatch(["//abc/def$image", "//abc/def$script", "//abc/def$~image"], "http://abc/def", "OTHER", null, false, null, false, "//abc/def$~image");
- checkMatch(["abc$image", "abc$~image", "//abc/def"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def");
- checkMatch(["//abc/def", "abc$image", "abc$~image"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def");
- checkMatch(["abc$image", "abc$~image", "//abc/def$image"], "http://abc/def", "IMAGE", null, false, null, false, "//abc/def$image");
- checkMatch(["abc$image", "abc$~image", "//abc/def$script"], "http://abc/def", "IMAGE", null, false, null, false, "abc$image");
- checkMatch(["abc$domain=foo.com", "abc$domain=bar.com", "abc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "foo.com", false, null, false, "abc$domain=foo.com");
- checkMatch(["abc$domain=foo.com", "abc$domain=bar.com", "abc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "bar.com", false, null, false, "abc$domain=bar.com");
- checkMatch(["abc$domain=foo.com", "abc$domain=bar.com", "abc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "baz.com", false, null, false, "abc$domain=~foo.com|~bar.com");
- checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "foo.com", false, null, false, "abc$domain=foo.com");
- checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "bar.com", false, null, false, null);
- checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://abc/def", "IMAGE", "baz.com", false, null, false, null);
- checkMatch(["abc$domain=foo.com", "cba$domain=bar.com", "ccc$domain=~foo.com|~bar.com"], "http://ccc/def", "IMAGE", "baz.com", false, null, false, "ccc$domain=~foo.com|~bar.com");
- checkMatch(["abc$sitekey=foo-publickey", "abc$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "foo.com", false, "foo-publickey", false, "abc$sitekey=foo-publickey");
- checkMatch(["abc$sitekey=foo-publickey", "abc$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "bar.com", false, "bar-publickey", false, "abc$sitekey=bar-publickey");
- checkMatch(["abc$sitekey=foo-publickey", "cba$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "bar.com", false, "bar-publickey", false, null);
- checkMatch(["abc$sitekey=foo-publickey", "cba$sitekey=bar-publickey"], "http://abc/def", "IMAGE", "baz.com", false, null, false, null);
- checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "foo.com", false, "foo-publickey", false, "abc$sitekey=foo-publickey,domain=foo.com");
- checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "foo.com", false, "bar-publickey", false, null);
- checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "bar.com", false, "foo-publickey", false, null);
- checkMatch(["abc$sitekey=foo-publickey,domain=foo.com", "abc$sitekey=bar-publickey,domain=bar.com"], "http://abc/def", "IMAGE", "bar.com", false, "bar-publickey", false, "abc$sitekey=bar-publickey,domain=bar.com");
- checkMatch(["@@foo.com$generichide"], "http://foo.com/bar", "GENERICHIDE", "foo.com", false, null, false, "@@foo.com$generichide");
- checkMatch(["@@foo.com$genericblock"], "http://foo.com/bar", "GENERICBLOCK", "foo.com", false, null, false, "@@foo.com$genericblock");
- checkMatch(["@@bar.com$generichide"], "http://foo.com/bar", "GENERICHIDE", "foo.com", false, null, false, null);
- checkMatch(["@@bar.com$genericblock"], "http://foo.com/bar", "GENERICBLOCK", "foo.com", false, null, false, null);
- checkMatch(["/bar"], "http://foo.com/bar", "IMAGE", "foo.com", false, null, true, null);
- checkMatch(["/bar$domain=foo.com"], "http://foo.com/bar", "IMAGE", "foo.com", false, null, true, "/bar$domain=foo.com");
- });
-
- test("Result cache checks", function()
- {
- let matcher = new CombinedMatcher();
- matcher.add(Filter.fromText("abc$image"));
- matcher.add(Filter.fromText("abc$script"));
- matcher.add(Filter.fromText("abc$~image,~script,~object,~ping"));
- matcher.add(Filter.fromText("cba$third-party"));
- matcher.add(Filter.fromText("cba$~third-party,~script"));
- matcher.add(Filter.fromText("http://def$image"));
- matcher.add(Filter.fromText("http://def$script"));
- matcher.add(Filter.fromText("http://def$~image,~script,~object,~ping"));
- matcher.add(Filter.fromText("http://fed$third-party"));
- matcher.add(Filter.fromText("http://fed$~third-party,~script"));
-
- cacheCheck(matcher, "http://abc", "IMAGE", null, false, "abc$image");
- cacheCheck(matcher, "http://abc", "SCRIPT", null, false, "abc$script");
- cacheCheck(matcher, "http://abc", "OTHER", null, false, "abc$~image,~script,~object,~ping");
- cacheCheck(matcher, "http://cba", "IMAGE", null, false, "cba$~third-party,~script");
- cacheCheck(matcher, "http://cba", "IMAGE", null, true, "cba$third-party");
- cacheCheck(matcher, "http://def", "IMAGE", null, false, "http://def$image");
- cacheCheck(matcher, "http://def", "SCRIPT", null, false, "http://def$script");
- cacheCheck(matcher, "http://def", "OTHER", null, false, "http://def$~image,~script,~object,~ping");
- cacheCheck(matcher, "http://fed", "IMAGE", null, false, "http://fed$~third-party,~script");
- cacheCheck(matcher, "http://fed", "IMAGE", null, true, "http://fed$third-party");
- cacheCheck(matcher, "http://abc_cba", "OBJECT", null, false, "cba$~third-party,~script");
- cacheCheck(matcher, "http://abc_cba", "OBJECT", null, true, "cba$third-party");
- cacheCheck(matcher, "http://abc_cba", "SCRIPT", null, false, "abc$script");
- cacheCheck(matcher, "http://def?http://fed", "OBJECT", null, false, "http://fed$~third-party,~script");
- cacheCheck(matcher, "http://def?http://fed", "OBJECT", null, true, "http://fed$third-party");
- cacheCheck(matcher, "http://def?http://fed", "SCRIPT", null, false, "http://def$script");
- });
-})();
« no previous file with comments | « chrome/content/tests/filterStorage.js ('k') | chrome/content/tests/regexpFilters_matching.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld