From afb9c7905ce3faa9ebc44a9a3802b774b95176cd Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sat, 28 May 2022 05:38:59 +0200 Subject: [PATCH] Reached 100% coverage, still needs to be more thourough --- src/bootstraparse/modules/context_mngr.py | 15 +++--- tests/modules/test_context_mngr.py | 59 +++++++++++++++++++++-- 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/src/bootstraparse/modules/context_mngr.py b/src/bootstraparse/modules/context_mngr.py index 0db2ecc..19c12a7 100644 --- a/src/bootstraparse/modules/context_mngr.py +++ b/src/bootstraparse/modules/context_mngr.py @@ -13,7 +13,7 @@ # "class_insert" >> container[number] -> Get an element from one of the mapped methods -from bootstraparse.modules import syntax +from bootstraparse.modules import syntax, error_mngr from bootstraparse.modules.error_mngr import MismatchedContainerError, log_exception, log_message # noqa @@ -21,8 +21,10 @@ class BaseContainer: """ Creates container holding all the elements from the start of a parsed element to its end. """ - def __init__(self): - self.content = [] + def __init__(self, content=None): + if content is None: + content = [] + self.content = content self.optionals = [] self.map = {} @@ -174,7 +176,7 @@ class EtOlistContainer(BaseContainer): class HyperLinkContainer(BaseContainer): def __init__(self): super().__init__() - self.map['url']: "" + self.map['url'] = "" pass @@ -344,9 +346,10 @@ class ContextManager: raise MismatchedContainerError(token) else: self._add_matched(token.label, index) - except MismatchedContainerError as e: - print(e) + error_mngr.log_exception(e, level="CRITICAL") # TODO: Be more specific. + + return self.pile # TODO: Cleanse the pile of None values def print_all(self): for e in self: diff --git a/tests/modules/test_context_mngr.py b/tests/modules/test_context_mngr.py index a1e977e..36c40e7 100644 --- a/tests/modules/test_context_mngr.py +++ b/tests/modules/test_context_mngr.py @@ -1,8 +1,9 @@ import pytest -import rich from bootstraparse.modules import context_mngr -from bootstraparse.modules.syntax import SemanticType, TextToken +from bootstraparse.modules.syntax import SemanticType, TextToken, Linebreak, StructuralElementStartToken, StructuralElementEndToken +from bootstraparse.modules.tools import __GLk +__XF = pytest.mark.xfail _list_classes = [ context_mngr.TextContainer, @@ -25,6 +26,43 @@ _list_classes = [ ] _base_list = [TextToken([1]), TextToken([2]), TextToken([3]), TextToken([4])] +_token_list_with_expected_result = [ + [ + [TextToken([1])], + [context_mngr.TextContainer([TextToken([1])])], + __GLk(1), + ], + [ + [TextToken([1]), Linebreak([])], + [ + context_mngr.TextContainer([TextToken([1])]), + context_mngr.LinebreakContainer([Linebreak([])]) + ], + __GLk(1), + ], + [ + [ + StructuralElementStartToken(["div"]), + TextToken([1]), + StructuralElementEndToken(["div"]), + ], + [ + context_mngr.SeContainer([ + StructuralElementStartToken(["div"]), + context_mngr.TextContainer([TextToken([1])]), + StructuralElementEndToken(["div"]) + ]), + None, + None, + ], + __GLk(1), + ], +] # TODO: Test a lot more thouroughly + +_zipped_token_list_with_expected_result = [ + pytest.param(*c[:3], marks=c[3:]) for c in _token_list_with_expected_result +] + @pytest.fixture def base_cm(): @@ -116,6 +154,7 @@ def test_context_mngr(): assert ~base == [] base.map = {'test': lambda: "test3"} assert base >> "test" == 'test3' + assert base != 1 def test_base_container_with_optionals(): @@ -153,7 +192,9 @@ def test_print(): def test_print_cm(base_cm): base_cm.print_all() - base_cm.pile = [context_mngr.BaseContainer(), context_mngr.BaseContainer(), "test", 3, context_mngr.BaseContainer()] + bc = context_mngr.BaseContainer() + bc.add('test') + base_cm.pile = [bc, bc, "test", 3, bc] base_cm.print_all() @@ -161,3 +202,15 @@ def test_container(): base = context_mngr.BaseContainer() assert base is not None assert base.to_container() == base + + +@pytest.mark.parametrize("init_list, expected, file_line", _zipped_token_list_with_expected_result) +def test_context_call(init_list, expected, file_line): + ctx = context_mngr.ContextManager(init_list) + assert ctx() == expected + + +def test_content_call_raises(): + ctx = context_mngr.ContextManager([StructuralElementEndToken(["1"])]) + with pytest.raises(SystemExit): + ctx()