Commit: 104f58785bc607207c60a69e8bd7ff6f9a991627 - CCastle2 (hg)

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

Commit MetaInfo

• Révision: 104f58785bc607207c60a69e8bd7ff6f9a991627 (tree)
• l'heure: 2023-02-04 08:02:24
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

asis

Change Summary

• modified: castle/writers/CC2Cpy/Component.py
• modified: pytst/writers/CC2Cpy/test_3b_CompInterface.py

Modification

diff -r dbe3865aa2cc -r 104f58785bc6 castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Fri Feb 03 23:04:13 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Sat Feb 04 00:02:24 2023 +0100
@@ -52,19 +52,18 @@
         return count
 
     def render(self, prepend:str="", indent="   ") ->str:
-        self.render_struct(prepend=prepend, indent=indent)
+        return self.render_struct(prepend=prepend, indent=indent)
 
     def render_struct(self, prepend:str="", indent="   ") ->str:                                   ## struct CC_B_ComponentInterface cc_CI_${name} ...
         """
         .. todo::
 
-           - Move `CC_B_ComponentInterface.render()` into a Rendering subclass-delegate
            - refactor & test: spilt into parts
            - optional: Use Jinja ipv f-strings
            - make name/prefix  (``f'cc_CI_{self.name}``) in a getter oid
            """
         name = f'cc_CI_{self.name}'
-        based_on_link = f'&cc_CI_{self.based_on[0].name}' if self.based_on[0] else "NULL"
+        based_on_link = f'&cc_CI_{self.based_on[0].name}' if self.based_on else "NULL"
 
         retval = []
         retval.append(f'{prepend}struct CC_B_ComponentInterface {name} = {{')

diff -r dbe3865aa2cc -r 104f58785bc6 pytst/writers/CC2Cpy/test_3b_CompInterface.py
--- a/pytst/writers/CC2Cpy/test_3b_CompInterface.py	Fri Feb 03 23:04:13 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_3b_CompInterface.py	Sat Feb 04 00:02:24 2023 +0100
@@ -21,26 +21,68 @@
 def subComp(demo2Comp):
     return CC_B_ComponentInterface('sub', based_on=demo2Comp)
 
-def test_0_name(emptyComp, demo2Comp):
+def test_0a_name(emptyComp, demo2Comp):
     assert emptyComp.name == 'empty'
     assert demo2Comp.name == 'demo2'
 
-def test_0_based_on(subComp, demo2Comp):
+def test_0b_based_on(subComp, demo2Comp):
     assert demo2Comp.based_on == ()
     assert subComp.based_on[0] is demo2Comp
 
-def test_1_NoOfPorts(emptyComp, demo2Comp):
+def test_1a_NoOfPorts(emptyComp, demo2Comp):
     assert emptyComp.no_of_ports() == 0
     assert demo2Comp.no_of_ports() == 2
 
-def test_1_NoOfPorts_variants(subComp):
+def test_1b_NoOfPorts_variants(subComp):
     assert subComp.no_of_ports() == 0                              # inherited=False, mine=True
-
     assert subComp.no_of_ports(inherited=False, mine=False) == 0
     assert subComp.no_of_ports(inherited=False, mine=True)  == 0
     assert subComp.no_of_ports(inherited=True,  mine=False) == 2
     assert subComp.no_of_ports(inherited=True,  mine=True)  == 2
 
+def test_1c_MorePorts():
+    p1 = CC_B_ComponentInterface('p1', ports =  CC_Port(name='no_1', type=None))
+    p2 = CC_B_ComponentInterface('p2', ports = [CC_Port(name='no_2', type=None), CC_Port(name='no_3', type=None)])
+    pa = CC_B_ComponentInterface('pa', ports =  CC_Port(name='no_4', type=None))
+    pb = CC_B_ComponentInterface('pb', based_on = pa)
+    p  = CC_B_ComponentInterface('p',  based_on = (p1,p2,pb))
+
+    assert p.no_of_ports(inherited=True, mine=True) == 4
+
+
+ref_emptyComp="""\
+struct CC_B_ComponentInterface cc_CI_Empty = {
+ .name          = "empty",
+ .inherit_from  = &cc_CI_Component,
+ .length        = 0,
+ .ports = {
+ }
+} ;
+"""
+
+ref_subComp="""\
+struct CC_B_ComponentInterface cc_CI_sub = {
+ .name          = "sub",
+ .inherit_from  = &cc_CI_demo2,
+ .length        = 0,
+ .ports = {
+ }
+} ;
+"""
+
+def test_render(emptyComp):
+    CCompare(ref_emptyComp, emptyComp.render())
+    CCompare(ref_emptyComp, emptyComp.render_struct())
+
+def test_render_whitespace(emptyComp):
+    # prepending a/o indenting with whitespace has no effect
+    CCompare(ref_emptyComp, emptyComp.render(prepend="\t\t", indent=""))
+    CCompare(ref_emptyComp, emptyComp.render_struct(prepend=" ", indent="\t\t\t"))
+
+
+def test_render_sub(subComp):
+    CCompare(ref_subComp, subComp.render())
+
 @pytest.mark.skip(reason="More CompInterface-tests are needed")
 def test_more(): pass