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

Side by Side Diff: test/elemHideEmulation.js

Issue 29587914: Issue 5142 - Convert Element Hiding to C++ (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Updated from feedback Created Jan. 25, 2018, 4:42 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « test/elemHide.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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-present eyeo GmbH 3 * Copyright (C) 2006-present 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 const {createSandbox} = require("./_common"); 20 const {createSandbox} = require("./_common");
21 const {withNAD} = require("./_test-utils");
21 22
22 let ElemHideEmulationFilter = null; 23 let ElemHideEmulationFilter = null;
23 let ElemHideEmulation = null; 24 let ElemHideEmulation = null;
24 let ElemHide = null; 25 let ElemHide = null;
25 let Filter = null; 26 let Filter = null;
26 27
27 exports.setUp = function(callback) 28 exports.setUp = function(callback)
28 { 29 {
29 let sandboxedRequire = createSandbox(); 30 let sandboxedRequire = createSandbox();
30 ( 31 (
31 {Filter, 32 {Filter,
32 ElemHideEmulationFilter} = sandboxedRequire("../lib/filterClasses"), 33 ElemHideEmulationFilter} = sandboxedRequire("../lib/filterClasses"),
33 {ElemHideEmulation} = sandboxedRequire("../lib/elemHideEmulation"), 34 {ElemHideEmulation} = sandboxedRequire("../lib/elemHideEmulation"),
34 {ElemHide} = sandboxedRequire("../lib/elemHide") 35 {ElemHide} = sandboxedRequire("../lib/elemHide")
35 ); 36 );
36 37
37 callback(); 38 callback();
38 }; 39 };
39 40
41 exports.testElemHideAPI = function(test)
42 {
43 withNAD(0, elemHide =>
44 {
45 withNAD(0, filter =>
46 {
47 elemHide.add(filter);
48 test.equal(filter.selectorDomain, "");
49 })(Filter.fromText("###ads"));
50
51 withNAD(0, unconditionals =>
52 {
53 test.equal(unconditionals.selectorCount, 1);
54 test.equal(unconditionals.selectorAt(0), "#ads");
55 test.equal(unconditionals.filterKeyAt(0), "###ads");
56 })(elemHide.getUnconditionalSelectors());
57
58 withNAD(0, filter =>
59 {
60 elemHide.add(filter);
61 test.equal(filter.selectorDomain, "example.com");
62 })(Filter.fromText("example.com##.foo"));
63
64 withNAD(
65 0, unconditionals =>
66 test.equal(unconditionals.selectorCount, 1))(elemHide.getUnconditionalSe lectors());
67
68 withNAD(0, selectors =>
69 {
70 test.equal(selectors.selectorCount, 1);
71 test.equal(selectors.selectorAt(0), ".foo");
72 test.equal(selectors.filterKeyAt(0), "example.com##.foo");
73 })(elemHide.getSelectorsForDomain("example.com", 1));
74
75 withNAD(0, selectors =>
76 {
77 test.equal(selectors.selectorCount, 2);
78 test.equal(selectors.selectorAt(0), "#ads");
79 test.equal(selectors.filterKeyAt(0), "###ads");
80 test.equal(selectors.selectorAt(1), ".foo");
81 test.equal(selectors.filterKeyAt(1), "example.com##.foo");
82 })(elemHide.getSelectorsForDomain("example.com", 0));
83
84 withNAD(0, filter3 =>
85 {
86 elemHide.add(filter3);
87
88 withNAD(
89 0, selectors =>
90 test.equal(selectors.selectorCount, 3))(
91 elemHide.getSelectorsForDomain("example.com", 0));
92
93 withNAD(
94 0, selectors =>
95 test.equal(selectors.selectorCount, 3))(
96 elemHide.getSelectorsForDomain("mail.example.com", 0));
97
98 withNAD(0, filter4 =>
99 {
100 elemHide.add(filter4);
101 withNAD(
102 0, selectors =>
103 test.equal(selectors.selectorCount, 3))(
104 elemHide.getSelectorsForDomain("example.com", 0));
105
106 withNAD(
107 0, selectors =>
108 test.equal(selectors.selectorCount, 2))(
109 elemHide.getSelectorsForDomain("mail.example.com", 0));
110
111 withNAD(
112 0,
113 unconditionals =>
114 test.equal(unconditionals.selectorCount, 1))(elemHide.getUncondition alSelectors());
115
116 elemHide.remove(filter4);
117 })(Filter.fromText("mail.example.com#@#.message"));
118
119 withNAD(
120 0, selectors =>
121 test.equal(selectors.selectorCount, 3))(
122 elemHide.getSelectorsForDomain("example.com", 0));
123
124 withNAD(
125 0, selectors =>
126 test.equal(selectors.selectorCount, 3))(
127 elemHide.getSelectorsForDomain("mail.example.com", 0));
128
129 elemHide.remove(filter3);
130 })(Filter.fromText("example.com##.message"));
131
132 withNAD(
133 0, selectors =>
134 test.equal(selectors.selectorCount, 2))(
135 elemHide.getSelectorsForDomain("example.com", 0));
136 })(ElemHide.create());
137
138 test.done();
139 };
140
40 exports.testDomainRestrictions = function(test) 141 exports.testDomainRestrictions = function(test)
41 { 142 {
42 function testSelectorMatches(description, filters, domain, expectedMatches) 143 function testSelectorMatches(description, filters, domain, expectedMatches)
43 { 144 {
44 for (let filter of filters) 145 withNAD(0, elemHide =>
45 { 146 {
46 filter = Filter.fromText(filter); 147 let addFilter = withNAD(0, filter =>
47 if (filter instanceof ElemHideEmulationFilter) 148 {
48 ElemHideEmulation.add(filter); 149 if (filter instanceof ElemHideEmulationFilter)
49 else 150 ElemHideEmulation.add(filter);
50 ElemHide.add(filter); 151 else
51 } 152 elemHide.add(filter);
153 });
52 154
53 let matches = ElemHideEmulation.getRulesForDomain(domain) 155 for (let text of filters)
54 .map(filter => filter.text); 156 addFilter(Filter.fromText(text));
55 test.deepEqual(matches.sort(), expectedMatches.sort(), description);
56 157
57 ElemHideEmulation.clear(); 158 let matches = ElemHideEmulation.getRulesForDomain(domain, elemHide)
58 ElemHide.clear(); 159 .map(filter => filter.text);
160 test.deepEqual(matches.sort(), expectedMatches.sort(), description);
161
162 ElemHideEmulation.clear();
163 })(ElemHide.create());
59 } 164 }
60 165
61 testSelectorMatches( 166 testSelectorMatches(
62 "Ignore generic filters", 167 "Ignore generic filters",
63 [ 168 [
64 "##[-abp-properties='foo']", "example.com##[-abp-properties='foo']", 169 "##[-abp-properties='foo']", "example.com##[-abp-properties='foo']",
65 "~example.com##[-abp-properties='foo']" 170 "~example.com##[-abp-properties='foo']"
66 ], 171 ],
67 "example.com", 172 "example.com",
68 ["example.com##[-abp-properties='foo']"] 173 ["example.com##[-abp-properties='foo']"]
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 ], 207 ],
103 "other.example.com", 208 "other.example.com",
104 ["other.example.com##[-abp-properties='foo']"] 209 ["other.example.com##[-abp-properties='foo']"]
105 ); 210 );
106 211
107 test.done(); 212 test.done();
108 }; 213 };
109 214
110 exports.testElemHideEmulationFiltersContainer = function(test) 215 exports.testElemHideEmulationFiltersContainer = function(test)
111 { 216 {
112 function compareRules(description, domain, expectedMatches) 217 withNAD(0, elemHide =>
113 { 218 {
114 let result = ElemHideEmulation.getRulesForDomain(domain) 219 function compareRules(description, domain, expectedMatches)
115 .map(filter => filter.text); 220 {
116 expectedMatches = expectedMatches.map(filter => filter.text); 221 let result = ElemHideEmulation.getRulesForDomain(domain, elemHide)
117 test.deepEqual(result.sort(), expectedMatches.sort(), description); 222 .map(filter => filter.text);
118 } 223 expectedMatches = expectedMatches.map(filter => filter.text);
224 test.deepEqual(result.sort(), expectedMatches.sort(), description);
225 }
119 226
120 let domainFilter = Filter.fromText("example.com##filter1"); 227 withNAD([0, 1, 2], (domainFilter, subdomainFilter, otherDomainFilter) =>
121 let subdomainFilter = Filter.fromText("www.example.com##filter2"); 228 {
122 let otherDomainFilter = Filter.fromText("other.example.com##filter3"); 229 ElemHideEmulation.add(domainFilter);
230 ElemHideEmulation.add(subdomainFilter);
231 ElemHideEmulation.add(otherDomainFilter);
232 compareRules(
233 "Return all matching filters",
234 "www.example.com",
235 [domainFilter, subdomainFilter]
236 );
123 237
124 ElemHideEmulation.add(domainFilter); 238 ElemHideEmulation.remove(domainFilter);
125 ElemHideEmulation.add(subdomainFilter); 239 compareRules(
126 ElemHideEmulation.add(otherDomainFilter); 240 "Return all matching filters after removing one",
127 compareRules( 241 "www.example.com",
128 "Return all matching filters", 242 [subdomainFilter]
129 "www.example.com", 243 );
130 [domainFilter, subdomainFilter]
131 );
132 244
133 ElemHideEmulation.remove(domainFilter); 245 ElemHideEmulation.clear();
134 compareRules( 246 compareRules(
135 "Return all matching filters after removing one", 247 "Return no filters after clearing",
136 "www.example.com", 248 "www.example.com",
137 [subdomainFilter] 249 []
138 ); 250 );
139 251 })(Filter.fromText("example.com##filter1"),
140 ElemHideEmulation.clear(); 252 Filter.fromText("www.example.com##filter2"),
141 compareRules( 253 Filter.fromText("other.example.com##filter3"));
142 "Return no filters after clearing", 254 })(ElemHide.create());
143 "www.example.com",
144 []
145 );
146 255
147 test.done(); 256 test.done();
148 }; 257 };
OLDNEW
« no previous file with comments | « test/elemHide.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld