Commit: a27eaba4f3343db2216d02709b6e143ff2cc1f3a - CCastle2 (hg)

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

Commit MetaInfo

• Revisão: a27eaba4f3343db2216d02709b6e143ff2cc1f3a (tree)
• Hora: 2022-02-12 04:19:22
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Mensagem de Log

Refactored Test: XML-serialization

Mudança Sumário

• modified: pytst/ast/XML_serialization/test_1_simpleXML.py
• add: pytst/ast/XML_serialization/__init__.py

Diff

diff -r 70b8c4ed931b -r a27eaba4f334 pytst/ast/XML_serialization/__init__.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/ast/XML_serialization/__init__.py	Fri Feb 11 20:19:22 2022 +0100
@@ -0,0 +1,57 @@
+import logging; logger = logging.getLogger(__name__)
+from xml.etree import ElementTree as ET
+
+from castle.ast import  peg
+
+
+class StdSequence_withAsserts:
+    """A class with some terminals and a sequence, and  assert-statements
+    """
+    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,):
+    """Partially verify an xml-string; focusing on 'tag' -- a real tag, or a (limited) XPATH-expression.
+
+    This `tag` (expression) should result in a single hit!. *Use e.g `[0]` as suffix to select one from a list*.
+    Pass ``key=value`` **attribs** to verify the found tag has those attribs and values
+    """
+
+    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
+
+
+def assert_QuantityGroup(xml_serialize, pegGrp, tagName):
+    seq = StdSequence_withAsserts()
+    txt = xml_serialize(pegGrp(expr=seq.seq))
+    logger.debug(f'XML:: {txt}')
+
+    assert_xml_Element(txt, tagName)
+    seq.assert_xml_Element(txt)
+
+def assert_QuantityID(xml_serialize, pegGrp, tagName, id_name='JustAName'):
+    txt = xml_serialize(pegGrp(expr=peg.ID(name=id_name)))
+    logger.debug(f'XML:: {txt}')
+
+    assert_xml_Element(txt, tagName)
+    assert_xml_Element(txt, tag='.//ID', name=id_name)

diff -r 70b8c4ed931b -r a27eaba4f334 pytst/ast/XML_serialization/test_1_simpleXML.py
--- a/pytst/ast/XML_serialization/test_1_simpleXML.py	Fri Feb 11 19:06:30 2022 +0100
+++ b/pytst/ast/XML_serialization/test_1_simpleXML.py	Fri Feb 11 20:19:22 2022 +0100
@@ -4,41 +4,7 @@
 
 from castle.ast import  peg, serialization
 
-
-class StdSequence_withAsserts:
-    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,):
-    """Partially verify an xml-string; focusing on 'tag' -- a real tag, or a (limited) XPATH-expression.
-
-    This `tag` (expression) should result in a single hit!. *Use e.g `[0]` as suffix to select one from a list*.
-    Pass ``key=value`` **attribs** to verify the found tag has those attribs and values
-    """
-
-    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
-
+from . import StdSequence_withAsserts, assert_xml_Element, assert_QuantityGroup, assert_QuantityID
 
 
 @pytest.fixture
@@ -117,14 +83,6 @@
     assert  tree.findall('.//Rule[1]')[0].attrib['name'] == 'rule_1'
     assert  tree.findall('.//Rule[2]//StrTerm')[0].attrib['value'] == 'str2'
 
-def assert_QuantityGroup(xml_serialize, pegGrp, tagName):
-    seq = StdSequence_withAsserts()
-    txt = xml_serialize(pegGrp(expr=seq.seq))
-    logger.debug(f'XML:: {txt}')
-
-    assert_xml_Element(txt, tagName)
-    seq.assert_xml_Element(txt)
-
 
 def test_OptionalSeq(xml_serialize):   assert_QuantityGroup(xml_serialize, peg.Optional, 'Optional')  			##  ` ( ...)? `
 def test_ZeroOrMoreSeq(xml_serialize): assert_QuantityGroup(xml_serialize, peg.ZeroOrMore, 'ZeroOrMore')		##  ` ( ...)* `
@@ -132,23 +90,18 @@
 def test_UnorderedGroup(xml_serialize): assert_QuantityGroup(xml_serialize, peg.UnorderedGroup, 'UnorderedGroup')  	##  ` ( ...)# ` # Only useful for a group/sequence!!
 
 
-def assert_QuantityID(xml_serialize, pegGrp, tagName, id_name='JustAName'):
-    txt = xml_serialize(pegGrp(expr=peg.ID(name=id_name)))
-    logger.debug(f'XML:: {txt}')
-
-    assert_xml_Element(txt, tagName)
-    assert_xml_Element(txt, tag='.//ID', name=id_name)
-
 def test_OptionalID(xml_serialize):   assert_QuantityID(xml_serialize, peg.Optional, 'Optional')
 def test_ZeroOrMoreID(xml_serialize): assert_QuantityID(xml_serialize, peg.ZeroOrMore, 'ZeroOrMore')
 def test_OneOrMoreID(xml_serialize):  assert_QuantityID(xml_serialize, peg.OneOrMore, 'OneOrMore')
 ## A bit uncommon: unordered group  of ONE  :`` Always#`` but it should work
 def test_UnorderedID(xml_serialize):  assert_QuantityID(xml_serialize, peg.UnorderedGroup, 'UnorderedGroup', 'strange')
 
+
 @pytest.mark.xfail(reason="Can't test as peg.OrderedChoice() isn't implemented")
 def test_OrderedChoice(xml_serialize): # e1 | e2 | e2
     e1 = peg.ID(name='ID_1')
     e2 = peg.StrTerm(value='str_2')
     e3 = peg.RegExpTerm(value='regexp_3')
     txt = xml_serialize(peg.OrderedChoice())                            # not implemented; never peg.OrderedChoice is never called
+
     assert False