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

Delta Between Two Patch Sets: test/matcher.js

Issue 29354864: Issue 4223 - Migrate some more of adblockplustests (Closed)
Left Patch Set: Use sandboxed-module Created Sept. 29, 2016, 3:44 p.m.
Right Patch Set: Addressed final nit Created Oct. 4, 2016, 12:16 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « test/filterStorage.js ('k') | test/regexpFilters_matching.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 "use strict"; 18 "use strict";
19 19
20 let {createSandbox} = require("common"); 20 let {createSandbox} = require("./_common");
21 let sandboxedRequire = createSandbox(); 21
22 22 let Filter = null;
23 let {Filter, RegExpFilter} = sandboxedRequire("filterClasses"); 23 let RegExpFilter = null;
24 let {CombinedMatcher, defaultMatcher, Matcher} = sandboxedRequire("matcher"); 24 let CombinedMatcher = null;
25 let defaultMatcher = null;
26 let Matcher = null;
27
28 exports.setUp = function(callback)
29 {
30 let sandboxedRequire = createSandbox();
31 (
32 {Filter, RegExpFilter} = sandboxedRequire("../lib/filterClasses"),
33 {CombinedMatcher, defaultMatcher, Matcher} = sandboxedRequire("../lib/matche r")
34 );
35
36 callback();
37 };
25 38
26 function compareKeywords(test, text, expected) 39 function compareKeywords(test, text, expected)
27 { 40 {
28 for (let filter of [Filter.fromText(text), Filter.fromText("@@" + text)]) 41 for (let filter of [Filter.fromText(text), Filter.fromText("@@" + text)])
29 { 42 {
30 let matcher = new Matcher(); 43 let matcher = new Matcher();
31 let result = []; 44 let result = [];
32 for (let dummy of expected) 45 for (let dummy of expected)
33 { 46 {
34 let keyword = matcher.findKeyword(filter); 47 let keyword = matcher.findKeyword(filter);
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 cacheCheck(test, matcher, "http://fed", "IMAGE", null, true, "http://fed$third -party"); 239 cacheCheck(test, matcher, "http://fed", "IMAGE", null, true, "http://fed$third -party");
227 cacheCheck(test, matcher, "http://abc_cba", "MEDIA", null, false, "cba$~third- party,~script"); 240 cacheCheck(test, matcher, "http://abc_cba", "MEDIA", null, false, "cba$~third- party,~script");
228 cacheCheck(test, matcher, "http://abc_cba", "MEDIA", null, true, "cba$third-pa rty"); 241 cacheCheck(test, matcher, "http://abc_cba", "MEDIA", null, true, "cba$third-pa rty");
229 cacheCheck(test, matcher, "http://abc_cba", "SCRIPT", null, false, "abc$script "); 242 cacheCheck(test, matcher, "http://abc_cba", "SCRIPT", null, false, "abc$script ");
230 cacheCheck(test, matcher, "http://def?http://fed", "MEDIA", null, false, "http ://fed$~third-party,~script"); 243 cacheCheck(test, matcher, "http://def?http://fed", "MEDIA", null, false, "http ://fed$~third-party,~script");
231 cacheCheck(test, matcher, "http://def?http://fed", "MEDIA", null, true, "http: //fed$third-party"); 244 cacheCheck(test, matcher, "http://def?http://fed", "MEDIA", null, true, "http: //fed$third-party");
232 cacheCheck(test, matcher, "http://def?http://fed", "SCRIPT", null, false, "htt p://def$script"); 245 cacheCheck(test, matcher, "http://def?http://fed", "SCRIPT", null, false, "htt p://def$script");
233 246
234 test.done(); 247 test.done();
235 }; 248 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld