diff --git a/tests/modules/test_context_mngr.py b/tests/modules/test_context_mngr.py index f37a759..f1b68e8 100644 --- a/tests/modules/test_context_mngr.py +++ b/tests/modules/test_context_mngr.py @@ -134,17 +134,17 @@ _token_list_with_expected_result = [ ], [ [ - sy.EtUlistToken(["a"]), + sy.EtUlistToken([sy.TextToken(["a"])]), sy.Linebreak([]), - sy.EtUlistToken(["b"]), + sy.EtUlistToken([sy.TextToken(["b"])]), sy.Linebreak([]), - sy.EtUlistToken(["c"]), - sy.EtUlistToken(["d"]), - sy.EtOlistToken(["aa"]), - sy.EtOlistToken(["bb"]), - sy.EtOlistToken(["cc"]), + sy.EtUlistToken([sy.TextToken(["c"])]), + sy.EtUlistToken([sy.TextToken(["d"])]), + sy.EtOlistToken([sy.TextToken(["aa"])]), + sy.EtOlistToken([sy.TextToken(["bb"])]), + sy.EtOlistToken([sy.TextToken(["cc"])]), sy.Linebreak([]), - sy.EtOlistToken(["dd"]), + sy.EtOlistToken([sy.TextToken(["dd"])]), sy.Linebreak([]), sy.Linebreak([]), sy.TextToken([1]), @@ -153,19 +153,19 @@ _token_list_with_expected_result = [ ], [ context_mngr.EtUlistContainer([ - sy.EtUlistToken(["a"]), + sy.EtUlistToken([sy.TextToken(["a"])]), sy.Linebreak([]), - sy.EtUlistToken(["b"]), + sy.EtUlistToken([sy.TextToken(["b"])]), sy.Linebreak([]), - sy.EtUlistToken(["c"]), - sy.EtUlistToken(["d"]), + sy.EtUlistToken([sy.TextToken(["c"])]), + sy.EtUlistToken([sy.TextToken(["d"])]), ]), context_mngr.EtUlistContainer([ - sy.EtOlistToken(["aa"]), - sy.EtOlistToken(["bb"]), - sy.EtOlistToken(["cc"]), + sy.EtOlistToken([sy.TextToken(["aa"])]), + sy.EtOlistToken([sy.TextToken(["bb"])]), + sy.EtOlistToken([sy.TextToken(["cc"])]), sy.Linebreak([]), - sy.EtOlistToken(["dd"]), + sy.EtOlistToken([sy.TextToken(["dd"])]), sy.Linebreak([]), ]), context_mngr.LinebreakContainer([sy.Linebreak([])]), @@ -397,6 +397,27 @@ _token_list_with_expected_result = [ __GLk(1), __XF, ], + [ + [ + sy.EtOlistToken([ + sy.TextToken(["a"]), + _opts, + ]), + sy.EtUlistToken([ + sy.TextToken(["b"]), + _opts, + ]), + ], + [ + context_mngr.EtOlistContainer([ + sy.EtOlistToken([sy.TextToken(["a"]), _opts]), + ]), + context_mngr.EtOlistContainer([ + sy.EtUlistToken([sy.TextToken(["b"]), _opts]), + ]), + ], + __GLk(1), # TODO : Add all optionals + ], ] _zipped_token_list_with_expected_result = [ @@ -565,10 +586,12 @@ def test_content_call_raises(): ctx() +@pytest.mark.xfail(reason="Not implemented") @pytest.mark.parametrize("container", _list_classes) def test_container_export(container, base_cm): em = export.ExportManager(None, None) assert type(container().export(em)) == str + assert container(_base_list).export(em) == str def test_export_error(): diff --git a/tests/modules/test_context_mngr_export.py b/tests/modules/test_context_mngr_export.py index 167f1b2..c7361bd 100644 --- a/tests/modules/test_context_mngr_export.py +++ b/tests/modules/test_context_mngr_export.py @@ -4,6 +4,13 @@ from bootstraparse.modules import context_mngr, export from bootstraparse.modules import syntax as sy #sy.SemanticType, sy.TextToken, sy.Linebreak, sy.StructuralElementStartToken, sy.StructuralElementEndToken, sy.EtUlistToken, sy.EtOlistToken # noqa from bootstraparse.modules.tools import __GLk __XF = pytest.mark.xfail +_opts = sy.OptionalToken([ + sy.OptionalVarToken([ + sy.BeAssignToken([["class", "blue"]]), + sy.BeValueToken([123]), + ]), + sy.OptionalInsertToken(["var='test', number=11"]), +]) _list_classes_expected_value = [ [ @@ -167,6 +174,22 @@ _list_classes_expected_value = [ __GLk(1), __XF, ], + [ + [ + context_mngr.EtOlistContainer([ + sy.EtOlistToken([ + context_mngr.TextContainer([ + sy.TextToken(['test13']), + ]), + _opts, + ]), + ]), + ], + "
  1. test13
", + __GLk(1), + __XF, + ], + ] _zipped_list_classes_expected_value = [