Commit: c88877e2c9a9a15ca06dfc68f5ad59946fb10c2f - CCastle2 (hg)

Castle: The best Real-Time/Embedded/HighTech language EVER. Attempt 2

Commit MetaInfo

• Revisión: c88877e2c9a9a15ca06dfc68f5ad59946fb10c2f (tree)
• Tiempo: 2022-02-07 01:34:07
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

renamed a (simple) test to show its about XML

Cambiar Resumen

• add: pytst/ast/XML_serialization/test_1_simpleXML.py
• delete: pytst/ast/XML_serialization/test_1_simple.py

Diferencia incremental

diff -r 6802c2cb6b62 -r c88877e2c9a9 pytst/ast/XML_serialization/test_1_simple.py
--- a/pytst/ast/XML_serialization/test_1_simple.py	Sun Feb 06 17:31:08 2022 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-import pytest
-from xml.etree import ElementTree as ET
-import logging; logger = logging.getLogger(__name__)
-
-from castle.ast import  peg, serialization
-
-
-class Sequence:
-    def __init__(self):
-        self.n1, self.v2, self.v3 = 'ID_1', 'str_2', 'regexp_3'
-        e1 = peg.ID(name=self.n1)
-        e2 = peg.StrTerm(value=self.v2)
-        e3 = peg.RegExpTerm(value=self.v3)
-        self.seq = peg.Sequence(value=[e1, e2, e3])
-    def assert_xml_Element(self, txt):
-        assert_xml_Element(txt, tag='.//Sequence')
-        assert_xml_Element(txt, tag='.//ID', name=self.n1)
-        assert_xml_Element(txt, tag='.//StrTerm',value=self.v2)
-        assert_xml_Element(txt, tag='.//RegExpTerm', value=self.v3)
-
-
-def assert_xml_Element(txt, tag,
-                       version="0.0",
-                       **attribs,):
-    tree = ET.fromstring(txt)
-    if version:
-        assert tree.attrib['version'] == version
-    founds = tree.findall(tag)
-    assert len(founds) == 1, f"Expected only one element; got: {len(founds)} :{founds}"
-    found = founds[0]
-    logger.debug(f'XXX1 tag={tag}:: found={found}')
-    for attrib, value in attribs.items():
-        logger.debug(f'XXX2 tag={tag}:: attrib={attrib}, value={value}')
-        assert found.attrib[attrib] == value
-
-
-
[e-mail]
-def xml_serialize():
-    return serialization.Serialize('xml').serialize
-
-
-
-def test_ID(xml_serialize):
-    txt = xml_serialize(peg.ID(name='demo_ID'))
-    assert_xml_Element(txt, tag='ID', name='demo_ID')
-
-
-def test_StrTerm(xml_serialize):
-    txt = xml_serialize(peg.StrTerm(value='demo string'))
-    assert_xml_Element(txt, tag='StrTerm', value='demo string')
-
-
-def test_RegExpTerm(xml_serialize):
-    txt = xml_serialize(peg.RegExpTerm(value='demo RegExp'))
-    assert_xml_Element(txt, tag='RegExpTerm', value='demo RegExp')
-
-
-def test_Sequence_1(xml_serialize):
-    e1 = peg.ID(name='ID_1')
-    txt= xml_serialize(peg.Sequence(value=[e1]))
-    logger.debug(f'XML:: {txt}')
-    assert_xml_Element(txt, tag='Sequence')
-    assert_xml_Element(txt, tag='.//ID', name='ID_1')
-
-
-
-def test_Sequence_3(xml_serialize):
-    seq = Sequence()
-    txt= xml_serialize(seq.seq)
-    logger.debug(f'XML:: {txt}')
-
-    assert_xml_Element(txt, tag='Sequence')
-    seq.assert_xml_Element(txt)
-
-
-def test_Rule_1ID(xml_serialize):
-    rule_name = "RuleName"
-    xref = "cross_ref"
-    expr = peg.Sequence(value=[peg.ID(name=xref)])
-
-    txt = xml_serialize(peg.Rule(name=peg.ID(name=rule_name), expr=expr))
-    logger.debug(f'XML:: {txt}')
-
-    assert_xml_Element(txt, tag='Rule', name=rule_name)
-    assert_xml_Element(txt, tag='.//ID', name=xref)
-
-
-def test_Rule_Sequence(xml_serialize):
-    rule_name = "Rule_Sequence"
-    seq = Sequence()
-
-    txt = xml_serialize(peg.Rule(name=peg.ID(name=rule_name), expr=seq.seq))
-    logger.debug(f'XML:: {txt}')
-
-    assert_xml_Element(txt, tag='Rule', name=rule_name)
-    seq.assert_xml_Element(txt)
-
-
-def test_Rules(xml_serialize):
-    r1 = peg.Rule(name=peg.ID(name='rule_1'), expr=peg.Sequence(value=[peg.ID(name='id1')]))
-    r2 = peg.Rule(name=peg.ID(name='rule_2'), expr=peg.Sequence(value=[peg.StrTerm(value='str2')]))
-
-    txt = xml_serialize(peg.Rules(children=[r1,r2]))
-    logger.debug(f'XML:: {txt}')
-
-    tree = ET.fromstring(txt)
-    assert len(tree.findall('.//Rule')) == 2
-    assert len(tree.findall('.//ID')) == 1
-    assert len(tree.findall('.//StrTerm')) == 1
-
-    assert  tree.findall('.//Rule[1]')[0].attrib['name'] == 'rule_1'
-    assert  tree.findall('.//Rule[2]//StrTerm')[0].attrib['value'] == 'str2'

diff -r 6802c2cb6b62 -r c88877e2c9a9 pytst/ast/XML_serialization/test_1_simpleXML.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/ast/XML_serialization/test_1_simpleXML.py	Sun Feb 06 17:34:07 2022 +0100
@@ -0,0 +1,113 @@
+import pytest
+from xml.etree import ElementTree as ET
+import logging; logger = logging.getLogger(__name__)
+
+from castle.ast import  peg, serialization
+
+
+class Sequence:
+    def __init__(self):
+        self.n1, self.v2, self.v3 = 'ID_1', 'str_2', 'regexp_3'
+        e1 = peg.ID(name=self.n1)
+        e2 = peg.StrTerm(value=self.v2)
+        e3 = peg.RegExpTerm(value=self.v3)
+        self.seq = peg.Sequence(value=[e1, e2, e3])
+    def assert_xml_Element(self, txt):
+        assert_xml_Element(txt, tag='.//Sequence')
+        assert_xml_Element(txt, tag='.//ID', name=self.n1)
+        assert_xml_Element(txt, tag='.//StrTerm',value=self.v2)
+        assert_xml_Element(txt, tag='.//RegExpTerm', value=self.v3)
+
+
+def assert_xml_Element(txt, tag,
+                       version="0.0",
+                       **attribs,):
+    tree = ET.fromstring(txt)
+    if version:
+        assert tree.attrib['version'] == version
+    founds = tree.findall(tag)
+    assert len(founds) == 1, f"Expected only one element; got: {len(founds)} :{founds}"
+    found = founds[0]
+    logger.debug(f'XXX1 tag={tag}:: found={found}')
+    for attrib, value in attribs.items():
+        logger.debug(f'XXX2 tag={tag}:: attrib={attrib}, value={value}')
+        assert found.attrib[attrib] == value
+
+
+
[e-mail]
+def xml_serialize():
+    return serialization.Serialize('xml').serialize
+
+
+
+def test_ID(xml_serialize):
+    txt = xml_serialize(peg.ID(name='demo_ID'))
+    assert_xml_Element(txt, tag='ID', name='demo_ID')
+
+
+def test_StrTerm(xml_serialize):
+    txt = xml_serialize(peg.StrTerm(value='demo string'))
+    assert_xml_Element(txt, tag='StrTerm', value='demo string')
+
+
+def test_RegExpTerm(xml_serialize):
+    txt = xml_serialize(peg.RegExpTerm(value='demo RegExp'))
+    assert_xml_Element(txt, tag='RegExpTerm', value='demo RegExp')
+
+
+def test_Sequence_1(xml_serialize):
+    e1 = peg.ID(name='ID_1')
+    txt= xml_serialize(peg.Sequence(value=[e1]))
+    logger.debug(f'XML:: {txt}')
+    assert_xml_Element(txt, tag='Sequence')
+    assert_xml_Element(txt, tag='.//ID', name='ID_1')
+
+
+
+def test_Sequence_3(xml_serialize):
+    seq = Sequence()
+    txt= xml_serialize(seq.seq)
+    logger.debug(f'XML:: {txt}')
+
+    assert_xml_Element(txt, tag='Sequence')
+    seq.assert_xml_Element(txt)
+
+
+def test_Rule_1ID(xml_serialize):
+    rule_name = "RuleName"
+    xref = "cross_ref"
+    expr = peg.Sequence(value=[peg.ID(name=xref)])
+
+    txt = xml_serialize(peg.Rule(name=peg.ID(name=rule_name), expr=expr))
+    logger.debug(f'XML:: {txt}')
+
+    assert_xml_Element(txt, tag='Rule', name=rule_name)
+    assert_xml_Element(txt, tag='.//ID', name=xref)
+
+
+def test_Rule_Sequence(xml_serialize):
+    rule_name = "Rule_Sequence"
+    seq = Sequence()
+
+    txt = xml_serialize(peg.Rule(name=peg.ID(name=rule_name), expr=seq.seq))
+    logger.debug(f'XML:: {txt}')
+
+    assert_xml_Element(txt, tag='Rule', name=rule_name)
+    seq.assert_xml_Element(txt)
+
+
+def test_Rules(xml_serialize):
+    r1 = peg.Rule(name=peg.ID(name='rule_1'), expr=peg.Sequence(value=[peg.ID(name='id1')]))
+    r2 = peg.Rule(name=peg.ID(name='rule_2'), expr=peg.Sequence(value=[peg.StrTerm(value='str2')]))
+
+    txt = xml_serialize(peg.Rules(children=[r1,r2]))
+    logger.debug(f'XML:: {txt}')
+
+    tree = ET.fromstring(txt)
+    assert len(tree.findall('.//Rule')) == 2
+    assert len(tree.findall('.//ID')) == 1
+    assert len(tree.findall('.//StrTerm')) == 1
+
+    assert  tree.findall('.//Rule[1]')[0].attrib['name'] == 'rule_1'
+    assert  tree.findall('.//Rule[2]//StrTerm')[0].attrib['value'] == 'str2'