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

Side by Side Diff: test/filterStorage.js

Issue 29852555: Issue 6559 - Convert subscriptions property of Filter to a set (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Created Aug. 10, 2018, 2:12 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/filterListener.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
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 function compareFiltersList(test, testMessage, list) 49 function compareFiltersList(test, testMessage, list)
50 { 50 {
51 let result = FilterStorage.subscriptions.map( 51 let result = FilterStorage.subscriptions.map(
52 subscription => subscription.filters.map( 52 subscription => subscription.filters.map(
53 filter => filter.text)); 53 filter => filter.text));
54 test.deepEqual(result, list, testMessage); 54 test.deepEqual(result, list, testMessage);
55 } 55 }
56 56
57 function compareFilterSubscriptions(test, testMessage, filter, list) 57 function compareFilterSubscriptions(test, testMessage, filter, list)
58 { 58 {
59 let result = filter.subscriptions.map(subscription => subscription.url); 59 let result = [...filter.subscriptions].map(subscription => subscription.url);
60 let expected = list.map(subscription => subscription.url); 60 let expected = list.map(subscription => subscription.url);
61 test.deepEqual(result, expected, testMessage); 61 test.deepEqual(result, expected, testMessage);
62 } 62 }
63 63
64 exports.testAddingSubscriptions = function(test) 64 exports.testAddingSubscriptions = function(test)
65 { 65 {
66 let subscription1 = Subscription.fromURL("http://test1/"); 66 let subscription1 = Subscription.fromURL("http://test1/");
67 let subscription2 = Subscription.fromURL("http://test2/"); 67 let subscription2 = Subscription.fromURL("http://test2/");
68 68
69 let changes = []; 69 let changes = [];
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 compareFilterSubscriptions(test, "filter3 subscriptions after updating http:// test3/ filters", filter3, [subscription2]); 491 compareFilterSubscriptions(test, "filter3 subscriptions after updating http:// test3/ filters", filter3, [subscription2]);
492 492
493 FilterStorage.removeSubscription(subscription3); 493 FilterStorage.removeSubscription(subscription3);
494 494
495 compareFilterSubscriptions(test, "filter1 subscriptions after removing http:// test3/", filter1, []); 495 compareFilterSubscriptions(test, "filter1 subscriptions after removing http:// test3/", filter1, []);
496 compareFilterSubscriptions(test, "filter2 subscriptions after removing http:// test3/", filter2, [subscription2]); 496 compareFilterSubscriptions(test, "filter2 subscriptions after removing http:// test3/", filter2, [subscription2]);
497 compareFilterSubscriptions(test, "filter3 subscriptions after removing http:// test3/", filter3, [subscription2]); 497 compareFilterSubscriptions(test, "filter3 subscriptions after removing http:// test3/", filter3, [subscription2]);
498 498
499 test.done(); 499 test.done();
500 }; 500 };
OLDNEW
« no previous file with comments | « test/filterListener.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld