Issue 7391 - Let rpy recursively parse filter options to dicts

tests/test_rpy.py

 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 """Functional tests for testing rPython integration."""
 from __future__ import unicode_literals
 
-from collections import namedtuple
+from collections import namedtuple, OrderedDict as Od
 import pytest
 import sys
 
 from abp.filters.rpy import tuple2dict, line2dict, lines2dicts
 
 
 _SAMPLE_TUPLE = namedtuple('tuple', 'foo,bar')
 
 _TEST_EXAMPLES = {
     'header': {
@@ skipping 31 matching lines @@
             b'target': b'www.test.py/filtelist.txt',
         },
     },
     'filter_single': {
         'in': b'foo.com##div#ad1',
         'out': {
             b'type': b'Filter',
             b'text': b'foo.com##div#ad1',
             b'selector': {b'type': b'css', b'value': b'div#ad1'},
             b'action': b'hide',
-            b'options': [(b'domain', [(b'foo.com', True)])],
+            b'options': {b'domain': {b'foo.com': True}},
         },
     },
     'filter_with_%': {
         'in': b'%22banner%*%22idzone%',
         'out': {
             b'type': b'Filter',
             b'text': b'%22banner%*%22idzone%',
             b'selector': {b'type': b'url-pattern',
                           b'value': b'%22banner%*%22idzone%'},
             b'action': b'block',
-            b'options': [],
+            b'options': {},
         },
     },
     'filter_multiple': {
         'in': b'foo.com,bar.com##div#ad1',
         'out': {
             b'type': b'Filter',
             b'text': b'foo.com,bar.com##div#ad1',
             b'selector': {b'type': b'css', b'value': b'div#ad1'},
             b'action': b'hide',
-            b'options': [(b'domain', [(b'foo.com', True), (b'bar.com',
-                                                           True)])],
+            b'options': {b'domain': {b'foo.com': True, b'bar.com': True}},
         },
     },
+    'filter_with_sitekey_list': {
+        'in': b'@@bla$ping,domain=foo.com|~bar.foo.com,sitekey=foo|bar',
+        'out':
+            Od([(b'text',
+                 b'@@bla$ping,domain=foo.com|~bar.foo.com,sitekey=foo|bar'),
+                (b'selector', {b'value': b'bla', b'type': b'url-pattern'}),
+                (b'action', b'allow'),
+                (b'options',
+                    Od([(b'ping', True),
+                        (b'domain', Od([(b'foo.com', True),
+                                        (b'bar.foo.com', False)])),
+                        (b'sitekey', [b'foo', b'bar'])])),
+                (b'type', b'Filter')]),
+    },
 }
 
 
 def check_data_utf8(data):
     """Check if all the strings in a dict are encoded as unicode.
 
     Parameters
     ----------
     data: dict
         The dictionary to be checked
@@ skipping 70 matching lines @@
     """Test that the API returns the correct result in the appropriate format.
 
     By default, lines2dicts() does not correctly parse headers and metadata.
     """
     tests = [t for t in _TEST_EXAMPLES.values()
              if t['out'][b'type'] not in {b'Header', b'Metadata'}]
     ins = [ex['in'] for ex in tests]
     outs = [ex['out'] for ex in tests]
 
     assert lines2dicts(ins) == outs