Side by Side Diff: tests/test_differ.py
Issue 29845767:
Issue 6685 - Offer incremental filter list downloads (Closed)
Base URL: https://hg.adblockplus.org/python-abp/
Patch Set: Store metadata in a dict
Created Aug. 29, 2018, 10:51 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« abp/filters/renderer.py ('K')
|
« abp/filters/renderer.py ('k')
|
tests/test_parser.py » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| (Empty) | |
| 1 # This file is part of Adblock Plus <https://adblockplus.org/>, | |
| 2 # Copyright (C) 2006-present eyeo GmbH | |
| 3 # | |
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | |
| 5 # it under the terms of the GNU General Public License version 3 as | |
| 6 # published by the Free Software Foundation. | |
| 7 # | |
| 8 # Adblock Plus is distributed in the hope that it will be useful, | |
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 11 # GNU General Public License for more details. | |
| 12 # | |
| 13 # You should have received a copy of the GNU General Public License | |
| 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | |
| 15 | |
| 16 | |
| 17 from abp.filters.renderer import render_diff | |
| 18 | |
| 19 BASE = '''[Adblock Plus 2.0] | |
| 20 ! Version: 111 | |
| 21 ! Diff-URL: https://easylist-downloads.adblockplus.org/easylist/diffs/111.txt | |
|
Sebastian Noack
2018/08/29 22:58:10
Perhaps turn one of the keys here to lowercase in
Sebastian Noack
2018/08/29 23:03:24
Ideally, there should be one key with changed and
Sebastian Noack
2018/08/30 16:38:33
It seems you missed this comment.
rhowell
2018/08/30 17:38:20
Oops! Done.
| |
| 22 ! Diff-Expires: 1 hours | |
| 23 ! Title: EasyList | |
| 24 ! Last modified: 26 Jul 2018 02:10 UTC | |
| 25 ! Expires: 1 days (update frequency) | |
| 26 ! Homepage: https://easylist.to/ | |
| 27 ! Licence: https://easylist.to/pages/licence.html | |
| 28 ! | |
| 29 ! Please report any unblocked adverts or problems | |
| 30 ! in the forums (https://forums.lanik.us/) | |
| 31 ! or via e-mail (easylist.subscription@gmail.com). | |
| 32 ! | |
| 33 !-----------------------General advert blocking filters-----------------------! | |
| 34 ! *** easylist:easylist/easylist_general_block.txt *** | |
| 35 test | |
| 36 &act=ads_ | |
| 37 &ad.vid=$~xmlhttprequest | |
| 38 &ad_box_ | |
| 39 ''' | |
| 40 | |
| 41 LATEST = '''[Adblock Plus 2.0] | |
| 42 ! Version: 123 | |
| 43 ! Diff-URL: https://easylist-downloads.adblockplus.org/easylist/diffs/123.txt | |
| 44 ! Diff-Expires: 1 hours | |
| 45 ! Title: EasyList | |
| 46 ! Last modified: 26 Jul 2018 21:00 UTC | |
| 47 ! Homepage: https://easylist.to/ | |
| 48 ! Licence: https://easylist.to/pages/licence.html | |
| 49 ! | |
| 50 ! Please report any unblocked adverts or problems | |
| 51 ! in the forums (https://forums.lanik.us/) | |
| 52 ! or via e-mail (easylist.subscription@gmail.com). | |
| 53 ! | |
| 54 !-----------------------General advert blocking filters-----------------------! | |
| 55 ! *** easylist:easylist/easylist_general_block.txt *** | |
| 56 &act=ads_ | |
| 57 &ad_box_ | |
| 58 &ad_channel= | |
| 59 test | |
| 60 ''' | |
| 61 | |
| 62 | |
| 63 EXPECTED = '''[Adblock Plus Diff] | |
| 64 ! Diff-URL: https://easylist-downloads.adblockplus.org/easylist/diffs/123.txt | |
| 65 ! Expires: | |
| 66 ! Version: 123 | |
| 67 - &ad.vid=$~xmlhttprequest | |
| 68 + &ad_channel= | |
| 69 ''' | |
| 70 | |
| 71 | |
| 72 def test_differ(): | |
| 73 exp = set(EXPECTED.splitlines()) | |
| 74 gen = set(render_diff(BASE.splitlines(), LATEST.splitlines())) | |
| 75 assert(gen == exp) | |
| OLD | NEW |
« abp/filters/renderer.py ('K')
|
« abp/filters/renderer.py ('k')
|
tests/test_parser.py » ('j')
|
no next file with comments »
