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

Delta Between Two Patch Sets: test/elemHideEmulation.js

Issue 29587914: Issue 5142 - Convert Element Hiding to C++ (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Some style change following feedback from a different review. Created Nov. 20, 2017, 8:53 p.m.
Right Patch Set: mFiltersByDomain is now an OwnedStringMap Created Jan. 26, 2018, 8:41 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/elemHide.js ('k') | no next file » | 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-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
40 exports.testElemHideAPI = function(test) 41 exports.testElemHideAPI = function(test)
41 { 42 {
43 withNAD(0, elemHide =>
42 { 44 {
43 let filter = Filter.fromText("###ads"); 45 withNAD(0, filter =>
44 ElemHide.add(filter); 46 {
45 47 elemHide.add(filter);
46 test.equal(filter.selectorDomain, ""); 48 test.equal(filter.selectorDomain, "");
47 let unconditionals = ElemHide.getUnconditionalSelectors(); 49 })(Filter.fromText("###ads"));
48 test.equal(unconditionals.selectorCount, 1); 50
49 test.equal(unconditionals.selectorAt(0), "#ads"); 51 withNAD(0, unconditionals =>
50 test.equal(unconditionals.filterKeyAt(0), "###ads"); 52 {
51 filter.delete(); 53 test.equal(unconditionals.selectorCount, 1);
52 unconditionals.delete(); 54 test.equal(unconditionals.selectorAt(0), "#ads");
53 } 55 test.equal(unconditionals.filterKeyAt(0), "###ads");
54 56 })(elemHide.getUnconditionalSelectors());
55 { 57
56 let filter2 = Filter.fromText("example.com##.foo"); 58 withNAD(0, filter =>
57 ElemHide.add(filter2); 59 {
58 test.equal(filter2.selectorDomain, "example.com"); 60 elemHide.add(filter);
59 filter2.delete(); 61 test.equal(filter.selectorDomain, "example.com");
60 } 62 })(Filter.fromText("example.com##.foo"));
61 63
62 let unconditionals = ElemHide.getUnconditionalSelectors(); 64 withNAD(
63 test.equal(unconditionals.selectorCount, 1); 65 0, unconditionals =>
64 unconditionals.delete(); 66 test.equal(unconditionals.selectorCount, 1))(elemHide.getUnconditionalSe lectors());
65 67
66 let selectors = ElemHide.getSelectorsForDomain("example.com", 1); 68 withNAD(0, selectors =>
67 test.equal(selectors.selectorCount, 1); 69 {
68 test.equal(selectors.selectorAt(0), ".foo"); 70 test.equal(selectors.selectorCount, 1);
69 test.equal(selectors.filterKeyAt(0), "example.com##.foo"); 71 test.equal(selectors.selectorAt(0), ".foo");
70 selectors.delete(); 72 test.equal(selectors.filterKeyAt(0), "example.com##.foo");
71 73 })(elemHide.getSelectorsForDomain("example.com", 1));
72 selectors = ElemHide.getSelectorsForDomain("example.com", 0); 74
73 test.equal(selectors.selectorCount, 2); 75 withNAD(0, selectors =>
74 test.equal(selectors.selectorAt(0), "#ads"); 76 {
75 test.equal(selectors.filterKeyAt(0), "###ads"); 77 test.equal(selectors.selectorCount, 2);
76 test.equal(selectors.selectorAt(1), ".foo"); 78 test.equal(selectors.selectorAt(0), "#ads");
77 test.equal(selectors.filterKeyAt(1), "example.com##.foo"); 79 test.equal(selectors.filterKeyAt(0), "###ads");
78 selectors.delete(); 80 test.equal(selectors.selectorAt(1), ".foo");
79 81 test.equal(selectors.filterKeyAt(1), "example.com##.foo");
80 let filter3 = Filter.fromText("example.com##.message"); 82 })(elemHide.getSelectorsForDomain("example.com", 0));
81 ElemHide.add(filter3); 83
82 selectors = ElemHide.getSelectorsForDomain("example.com", 0); 84 withNAD(0, filter3 =>
83 test.equal(selectors.selectorCount, 3); 85 {
84 selectors.delete(); 86 elemHide.add(filter3);
85 selectors = ElemHide.getSelectorsForDomain("mail.example.com", 0); 87
86 test.equal(selectors.selectorCount, 3); 88 withNAD(
87 selectors.delete(); 89 0, selectors =>
88 90 test.equal(selectors.selectorCount, 3))(
89 let filter4 = Filter.fromText("mail.example.com#@#.message"); 91 elemHide.getSelectorsForDomain("example.com", 0));
90 ElemHide.add(filter4); 92
91 selectors = ElemHide.getSelectorsForDomain("example.com", 0); 93 withNAD(
92 test.equal(selectors.selectorCount, 3); 94 0, selectors =>
93 selectors.delete(); 95 test.equal(selectors.selectorCount, 3))(
94 selectors = ElemHide.getSelectorsForDomain("mail.example.com", 0); 96 elemHide.getSelectorsForDomain("mail.example.com", 0));
95 test.equal(selectors.selectorCount, 2); 97
96 selectors.delete(); 98 withNAD(0, filter4 =>
97 99 {
98 unconditionals = ElemHide.getUnconditionalSelectors(); 100 elemHide.add(filter4);
99 test.equal(unconditionals.selectorCount, 1); 101 withNAD(
100 unconditionals.delete(); 102 0, selectors =>
101 103 test.equal(selectors.selectorCount, 3))(
102 ElemHide.remove(filter4); 104 elemHide.getSelectorsForDomain("example.com", 0));
103 filter4.delete(); 105
104 selectors = ElemHide.getSelectorsForDomain("example.com", 0); 106 withNAD(
105 test.equal(selectors.selectorCount, 3); 107 0, selectors =>
106 selectors.delete(); 108 test.equal(selectors.selectorCount, 2))(
107 selectors = ElemHide.getSelectorsForDomain("mail.example.com", 0); 109 elemHide.getSelectorsForDomain("mail.example.com", 0));
108 test.equal(selectors.selectorCount, 3); 110
109 selectors.delete(); 111 withNAD(
110 112 0,
111 ElemHide.remove(filter3); 113 unconditionals =>
112 filter3.delete(); 114 test.equal(unconditionals.selectorCount, 1))(elemHide.getUncondition alSelectors());
113 selectors = ElemHide.getSelectorsForDomain("example.com", 0); 115
114 test.equal(selectors.selectorCount, 2); 116 elemHide.remove(filter4);
115 selectors.delete(); 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());
116 137
117 test.done(); 138 test.done();
118 }; 139 };
119 140
120 exports.testDomainRestrictions = function(test) 141 exports.testDomainRestrictions = function(test)
121 { 142 {
122 function testSelectorMatches(description, filters, domain, expectedMatches) 143 function testSelectorMatches(description, filters, domain, expectedMatches)
123 { 144 {
124 for (let text of filters) 145 withNAD(0, elemHide =>
125 { 146 {
126 let filter = Filter.fromText(text); 147 let addFilter = withNAD(0, filter =>
127 if (filter instanceof ElemHideEmulationFilter) 148 {
128 ElemHideEmulation.add(filter); 149 if (filter instanceof ElemHideEmulationFilter)
129 else 150 ElemHideEmulation.add(filter);
130 ElemHide.add(filter); 151 else
131 filter.delete(); 152 elemHide.add(filter);
132 } 153 });
133 let matches = ElemHideEmulation.getRulesForDomain(domain) 154
134 .map(filter => filter.text); 155 for (let text of filters)
135 test.deepEqual(matches.sort(), expectedMatches.sort(), description); 156 addFilter(Filter.fromText(text));
136 157
137 ElemHideEmulation.clear(); 158 let matches = ElemHideEmulation.getRulesForDomain(domain, elemHide)
138 ElemHide.clear(); 159 .map(filter => filter.text);
160 test.deepEqual(matches.sort(), expectedMatches.sort(), description);
161
162 ElemHideEmulation.clear();
163 })(ElemHide.create());
139 } 164 }
140 165
141 testSelectorMatches( 166 testSelectorMatches(
142 "Ignore generic filters", 167 "Ignore generic filters",
143 [ 168 [
144 "##[-abp-properties='foo']", "example.com##[-abp-properties='foo']", 169 "##[-abp-properties='foo']", "example.com##[-abp-properties='foo']",
145 "~example.com##[-abp-properties='foo']" 170 "~example.com##[-abp-properties='foo']"
146 ], 171 ],
147 "example.com", 172 "example.com",
148 ["example.com##[-abp-properties='foo']"] 173 ["example.com##[-abp-properties='foo']"]
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 ], 207 ],
183 "other.example.com", 208 "other.example.com",
184 ["other.example.com##[-abp-properties='foo']"] 209 ["other.example.com##[-abp-properties='foo']"]
185 ); 210 );
186 211
187 test.done(); 212 test.done();
188 }; 213 };
189 214
190 exports.testElemHideEmulationFiltersContainer = function(test) 215 exports.testElemHideEmulationFiltersContainer = function(test)
191 { 216 {
192 function compareRules(description, domain, expectedMatches) 217 withNAD(0, elemHide =>
193 { 218 {
194 let result = ElemHideEmulation.getRulesForDomain(domain) 219 function compareRules(description, domain, expectedMatches)
195 .map(filter => filter.text); 220 {
196 expectedMatches = expectedMatches.map(filter => filter.text); 221 let result = ElemHideEmulation.getRulesForDomain(domain, elemHide)
197 test.deepEqual(result.sort(), expectedMatches.sort(), description); 222 .map(filter => filter.text);
198 } 223 expectedMatches = expectedMatches.map(filter => filter.text);
199 224 test.deepEqual(result.sort(), expectedMatches.sort(), description);
200 let domainFilter = Filter.fromText("example.com##filter1"); 225 }
201 let subdomainFilter = Filter.fromText("www.example.com##filter2"); 226
202 let otherDomainFilter = Filter.fromText("other.example.com##filter3"); 227 withNAD([0, 1, 2], (domainFilter, subdomainFilter, otherDomainFilter) =>
203 228 {
204 ElemHideEmulation.add(domainFilter); 229 ElemHideEmulation.add(domainFilter);
205 ElemHideEmulation.add(subdomainFilter); 230 ElemHideEmulation.add(subdomainFilter);
206 ElemHideEmulation.add(otherDomainFilter); 231 ElemHideEmulation.add(otherDomainFilter);
207 compareRules( 232 compareRules(
208 "Return all matching filters", 233 "Return all matching filters",
209 "www.example.com", 234 "www.example.com",
210 [domainFilter, subdomainFilter] 235 [domainFilter, subdomainFilter]
211 ); 236 );
212 237
213 ElemHideEmulation.remove(domainFilter); 238 ElemHideEmulation.remove(domainFilter);
214 compareRules( 239 compareRules(
215 "Return all matching filters after removing one", 240 "Return all matching filters after removing one",
216 "www.example.com", 241 "www.example.com",
217 [subdomainFilter] 242 [subdomainFilter]
218 ); 243 );
219 244
220 ElemHideEmulation.clear(); 245 ElemHideEmulation.clear();
221 compareRules( 246 compareRules(
222 "Return no filters after clearing", 247 "Return no filters after clearing",
223 "www.example.com", 248 "www.example.com",
224 [] 249 []
225 ); 250 );
251 })(Filter.fromText("example.com##filter1"),
252 Filter.fromText("www.example.com##filter2"),
253 Filter.fromText("other.example.com##filter3"));
254 })(ElemHide.create());
226 255
227 test.done(); 256 test.done();
228 }; 257 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld