reworked build system; added missing license notices

1 files changed, 24 insertions, 28 deletions

diff --git a/test/unit/test_patterns_query_tree.py b/test/unit/test_patterns_query_tree.py
index a67e22f..80bf554 100644
--- a/test/unit/test_patterns_query_tree.py
+++ b/test/unit/test_patterns_query_tree.py
@@ -21,18 +21,14 @@ import pytest
 
 from ..script_loader import load_script
 
-@pytest.fixture(scope="session")
-def patterns_tree_code():
-    yield load_script('common/patterns_query_tree.js', ['common'])
-
 @pytest.mark.get_page('https://gotmyowndoma.in')
-def test_modify_branch(execute_in_page, patterns_tree_code):
+def test_modify_branch(execute_in_page):
     """
     patterns_query_tree.js contains Pattern Tree data structure that allows
     arrays of string labels to be mapped to items.
     Verify operations modifying a single branch of such tree work properly.
     """
-    execute_in_page(patterns_tree_code)
+    execute_in_page(load_script('common/patterns_query_tree.js'))
     execute_in_page(
         '''
         let items_added;
@@ -197,13 +193,13 @@ def test_modify_branch(execute_in_page, patterns_tree_code):
             }
 
 @pytest.mark.get_page('https://gotmyowndoma.in')
-def test_search_branch(execute_in_page, patterns_tree_code):
+def test_search_branch(execute_in_page):
     """
     patterns_query_tree.js contains Pattern Tree data structure that allows
     arrays of string labels to be mapped to items.
     Verify searching a single branch of such tree work properly.
     """
-    execute_in_page(patterns_tree_code)
+    execute_in_page(load_script('common/patterns_query_tree.js'))
     execute_in_page(
         '''
         const item_adder = item => (array => [...(array || []), item]);
@@ -285,13 +281,13 @@ def test_search_branch(execute_in_page, patterns_tree_code):
             raise e from None
 
 @pytest.mark.get_page('https://gotmyowndoma.in')
-def test_pattern_tree(execute_in_page, patterns_tree_code):
+def test_pattern_tree(execute_in_page):
     """
     patterns_query_tree.js contains Pattern Tree data structure that allows
     arrays of string labels to be mapped to items.
     Verify operations on entire such tree work properly.
     """
-    execute_in_page(patterns_tree_code)
+    execute_in_page(load_script('common/patterns_query_tree.js'))
 
     # Perform tests with all possible patterns for a simple URL.
     url = 'https://example.com'
@@ -315,12 +311,12 @@ def test_pattern_tree(execute_in_page, patterns_tree_code):
 
     tree, result = execute_in_page(
         '''{
-        const tree = pattern_tree.make();
+        const tree = pattern_tree_make();
         for (const pattern of arguments[0].concat(arguments[1])) {
-            pattern_tree.register(tree, pattern,       'key', pattern);
-            pattern_tree.register(tree, pattern + '/', 'key', pattern + '/');
+            pattern_tree_register(tree, pattern,       'key', pattern);
+            pattern_tree_register(tree, pattern + '/', 'key', pattern + '/');
         }
-        returnval([tree, [...pattern_tree.search(tree, arguments[2])]]);
+        returnval([tree, [...pattern_tree_search(tree, arguments[2])]]);
         }''',
         patterns, bad_patterns, url)
     assert expected == result
@@ -333,10 +329,10 @@ def test_pattern_tree(execute_in_page, patterns_tree_code):
         '''{
         const tree = arguments[0];
         for (const pattern of arguments[1]) {
-            pattern_tree.deregister(tree, pattern,       'key');
-            pattern_tree.deregister(tree, pattern + '/', 'key');
+            pattern_tree_deregister(tree, pattern,       'key');
+            pattern_tree_deregister(tree, pattern + '/', 'key');
         }
-        returnval([tree, [...pattern_tree.search(tree, arguments[2])]]);
+        returnval([tree, [...pattern_tree_search(tree, arguments[2])]]);
         }''',
         tree, patterns_removed, url)
     assert expected == result
@@ -346,8 +342,8 @@ def test_pattern_tree(execute_in_page, patterns_tree_code):
         '''{
         const tree = arguments[0];
         for (const pattern of arguments[1].concat(arguments[2])) {
-            pattern_tree.deregister(tree, pattern,       'key');
-            pattern_tree.deregister(tree, pattern + '/', 'key');
+            pattern_tree_deregister(tree, pattern,       'key');
+            pattern_tree_deregister(tree, pattern + '/', 'key');
         }
         returnval(tree);
         }''',
@@ -439,12 +435,12 @@ def test_pattern_tree(execute_in_page, patterns_tree_code):
 
     tree, result = execute_in_page(
         '''{
-        const tree = pattern_tree.make();
+        const tree = pattern_tree_make();
         for (const pattern of arguments[0].concat(arguments[1])) {
-            pattern_tree.register(tree, pattern,       'key', pattern);
-            pattern_tree.register(tree, pattern + '/', 'key', pattern + '/');
+            pattern_tree_register(tree, pattern,       'key', pattern);
+            pattern_tree_register(tree, pattern + '/', 'key', pattern + '/');
         }
-        returnval([tree, [...pattern_tree.search(tree, arguments[2])]]);
+        returnval([tree, [...pattern_tree_search(tree, arguments[2])]]);
         }''',
         patterns, bad_patterns, url)
     assert expected == result
@@ -456,8 +452,8 @@ def test_pattern_tree(execute_in_page, patterns_tree_code):
         '''{
         const tree = arguments[0];
         for (const pattern of arguments[1])
-            pattern_tree.deregister(tree, pattern + '/', 'key');
-        returnval([tree, [...pattern_tree.search(tree, arguments[2])]]);
+            pattern_tree_deregister(tree, pattern + '/', 'key');
+        returnval([tree, [...pattern_tree_search(tree, arguments[2])]]);
         }''',
         tree, patterns, url)
     assert expected == result
@@ -467,10 +463,10 @@ def test_pattern_tree(execute_in_page, patterns_tree_code):
         '''{
         const tree = arguments[0];
         for (const pattern of arguments[1])
-            pattern_tree.deregister(tree, pattern,       'key');
+            pattern_tree_deregister(tree, pattern,       'key');
         for (const pattern of arguments[2]) {
-            pattern_tree.deregister(tree, pattern,       'key');
-            pattern_tree.deregister(tree, pattern + '/', 'key');
+            pattern_tree_deregister(tree, pattern,       'key');
+            pattern_tree_deregister(tree, pattern + '/', 'key');
         }
         returnval(tree);
         }''',