Delta Between Two Patch Sets: tests/test_differ.py
Issue 29884571:
Issue 6945 - Add script to make filter list diffs (Closed)
Base URL: https://hg.adblockplus.org/python-abp/
Left Patch Set: Handle non-ascii, remove extraneous test
Created Sept. 21, 2018, 8:33 a.m.
Right Patch Set: Fix docstring
Created Sept. 26, 2018, 6:20 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« tests/test_diff_script.py ('k')
|
no next file »
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 1 # This file is part of Adblock Plus <https://adblockplus.org/>, | 1 # This file is part of Adblock Plus <https://adblockplus.org/>, |
| 2 # Copyright (C) 2006-present eyeo GmbH | 2 # Copyright (C) 2006-present eyeo GmbH |
| 3 # | 3 # |
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | 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 | 5 # it under the terms of the GNU General Public License version 3 as |
| 6 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. |
| 7 # | 7 # |
| 8 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, |
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 11 # GNU General Public License for more details. | 11 # GNU General Public License for more details. |
| 12 # | 12 # |
| 13 # You should have received a copy of the GNU General Public License | 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/>. | 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 15 | |
| 16 | 15 |
| 17 from __future__ import unicode_literals | 16 from __future__ import unicode_literals |
|
Sebastian Noack
2018/09/21 11:51:21
Nit: It seems in all other files we only have one
rhowell
2018/09/24 22:05:21
Done.
| |
| 18 | 17 |
| 19 from abp.filters.renderer import render_diff | 18 from abp.filters.renderer import render_diff |
| 20 | 19 |
| 21 BASE = '''[Adblock Plus 2.0] | 20 BASE = '''[Adblock Plus 2.0] |
| 22 ! Version: 111 | 21 ! Version: 111 |
| 23 ! diff-url: https://easylist-downloads.adblockplus.org/easylist/diffs/111.txt | 22 ! diff-url: https://easylist-downloads.adblockplus.org/easylist/diffs/111.txt |
| 24 ! diff-expires: 1 hours | 23 ! diff-expires: 1 hours |
| 25 ! Title: EasyList | 24 ! Title: EasyList |
| 26 ! Expires: 1 days (update frequency) | 25 ! Expires: 1 days (update frequency) |
| 27 ! Homepage: https://easylist.to/ | 26 ! Homepage: https://easylist.to/ |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 ! Version: 123 | 65 ! Version: 123 |
| 67 - &ad.vid=$~xmlhttprequest | 66 - &ad.vid=$~xmlhttprequest |
| 68 + &ad_channel=\U000000a3 | 67 + &ad_channel=\U000000a3 |
| 69 ''' | 68 ''' |
| 70 | 69 |
| 71 | 70 |
| 72 def test_differ(): | 71 def test_differ(): |
| 73 exp = set(EXPECTED.splitlines()) | 72 exp = set(EXPECTED.splitlines()) |
| 74 gen = set(render_diff(BASE.splitlines(), LATEST.splitlines())) | 73 gen = set(render_diff(BASE.splitlines(), LATEST.splitlines())) |
| 75 assert(gen == exp) | 74 assert(gen == exp) |
| LEFT | RIGHT |
« tests/test_diff_script.py ('k')
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
