Commit: b128e4fff750b070f5edb105c5bb644e0bd6b8e1 - CCastle2 (hg)

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

Commit MetaInfo

• Revision: b128e4fff750b070f5edb105c5bb644e0bd6b8e1 (tree)
• Zeit: 2022-02-26 00:21:30
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Refactored (AST2XML) tests: keep localverify-function local

Ändern Zusammenfassung

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

Diff

diff -r 9d73bcba9bf6 -r b128e4fff750 pytst/ast/XML_serialization/__init__.py
--- a/pytst/ast/XML_serialization/__init__.py	Tue Feb 22 23:42:30 2022 +0100
+++ b/pytst/ast/XML_serialization/__init__.py	Fri Feb 25 16:21:30 2022 +0100
@@ -45,21 +45,3 @@
 
     if child_count:
         assert len(found) == child_count, f"The number of children of '{tag}' is {len(found)}, which does not match the specified child_count={child_count}"
-
-
-
-def verify_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 verify_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 9d73bcba9bf6 -r b128e4fff750 pytst/ast/XML_serialization/test_1_simpleXML.py
--- a/pytst/ast/XML_serialization/test_1_simpleXML.py	Tue Feb 22 23:42:30 2022 +0100
+++ b/pytst/ast/XML_serialization/test_1_simpleXML.py	Fri Feb 25 16:21:30 2022 +0100
@@ -4,7 +4,7 @@
 
 from castle.ast import  peg, serialization
 
-from . import StdSequence_withAsserts, assert_xml_Element, verify_QuantityGroup, verify_QuantityID
+from . import StdSequence_withAsserts, assert_xml_Element
 
 
 @pytest.fixture
@@ -84,17 +84,35 @@
     assert  tree.findall('.//Rule[2]//StrTerm')[0].attrib['value'] == 'str2'
 
 
+
+def verify_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):    verify_QuantityGroup(xml_serialize, peg.Optional, 'Optional')  			##  ` ( ...)? `
 def test_ZeroOrMoreSeq(xml_serialize):  verify_QuantityGroup(xml_serialize, peg.ZeroOrMore, 'ZeroOrMore')		##  ` ( ...)* `
 def test_OneOrMoreSeq(xml_serialize):   verify_QuantityGroup(xml_serialize, peg.OneOrMore, 'OneOrMore')			##  ` ( ...)+ `
 def test_UnorderedGroup(xml_serialize): verify_QuantityGroup(xml_serialize, peg.UnorderedGroup, 'UnorderedGroup')  	##  ` ( ...)# ` # Only useful for a group/sequence!!
 
+
+def verify_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):    verify_QuantityID(xml_serialize, peg.Optional, 'Optional')
 def test_ZeroOrMoreID(xml_serialize):  verify_QuantityID(xml_serialize, peg.ZeroOrMore, 'ZeroOrMore')
 def test_OneOrMoreID(xml_serialize):   verify_QuantityID(xml_serialize, peg.OneOrMore, 'OneOrMore')
 def test_UnorderedID(xml_serialize):   verify_QuantityID(xml_serialize, peg.UnorderedGroup, 'UnorderedGroup', 'strange') ## A bit uncommon: an unordered group of ONE! But it should work.
 
 
+
 def test_OC3(xml_serialize): # e1 | e2 | e2
     e1, e2, e3 = peg.ID(name='ID_1'), peg.StrTerm(value='str_2'), peg.RegExpTerm(value='regexp_3')
     txt = xml_serialize(peg.OrderedChoice(children=[e1,e2,e3]))
@@ -178,3 +196,6 @@
     assert len(tree.findall('.//Setting')) == 2
     assert len(tree.findall('.//ID')) == 2
 
+
+
+