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

Powered by Google App Engine
This is Rietveld