Commit: c51a7a805905f3a9db7f73639668f85e092db2e9 - CCastle2 (hg)

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

Commit MetaInfo

• Revision: c51a7a805905f3a9db7f73639668f85e092db2e9 (tree)
• Time: 2023-02-07 06:31:23
• Author: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

(asis) added all test for ComponentInterface

Change Summary

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

Incremental Difference

diff -r 5259c3022adc -r c51a7a805905 castle/writers/CC2Cpy/Component.py
--- a/castle/writers/CC2Cpy/Component.py	Mon Feb 06 21:34:34 2023 +0100
+++ b/castle/writers/CC2Cpy/Component.py	Mon Feb 06 22:31:23 2023 +0100
@@ -82,7 +82,7 @@
         retval.append(f'{prepend}{indent}.ports = {{')
         start_port_no = self.no_of_ports(inherited=True, mine=False)            # pragma: no mutate on inherited/mine
         for no,port in enumerate(self.ports, start_port_no):                    # Loop over 'own' ports
-            retval.append(f'{prepend}{(indent*3)[:-2]}{{')
+            retval.append(f'{prepend}{indent*2}{{')
             retval.append(f'{prepend}{indent*3}.portNo    =  {no},')
             retval.append(f'{prepend}{indent*3}.protocol  = {port.portray_typePtr()},')
             retval.append(f'{prepend}{indent*3}.direction =  {port.direction.portray_name()},')

diff -r 5259c3022adc -r c51a7a805905 pytst/writers/CC2Cpy/test_3b_CompInterface.py
--- a/pytst/writers/CC2Cpy/test_3b_CompInterface.py	Mon Feb 06 21:34:34 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_3b_CompInterface.py	Mon Feb 06 22:31:23 2023 +0100
@@ -55,7 +55,7 @@
    .direction =  CC_B_PortDirectionIs_UNKNOWN,
    .name      = "jap2",
    .part_of   = &cc_CI_demo2Comp },
-  },
+ },
 } ;
 """
 
@@ -118,3 +118,26 @@
 
 def test_2d_render_withPorts(demo2Comp):
     assert CCompare(ref_demo2Comp, demo2Comp.render())
+
+def verify_indent(ref, comp): # indent can be used several times ...
+    try_indent="_-|"
+    out = comp.render(indent=try_indent, prepend="")
+    logger.info("ComponentInterface %s results in::\n%s", comp.name, out)
+
+    for ref_line,out_line in zip(ref.splitlines(), out.splitlines()):
+        ref_indents = len(ref_line)-len(ref_line.lstrip(' '))
+        logger.debug("ref_line: %s", ref_line); logger.debug("out_line: %s", out_line)
+
+        assert out_line[:len(try_indent)*ref_indents] == try_indent*ref_indents
+        if ref_indents >0:
+            without_pref = out_line[len(try_indent*ref_indents):]
+            assert without_pref[0:len(try_indent)] != try_indent
+
+def test_3a_indent_empty(emptyComp):
+    verify_indent(ref_emptyComp, emptyComp)
+
+def test_3b_indent_demo(demo2Comp):
+    verify_indent(ref_demo2Comp, demo2Comp)
+
+def test_3c_indent_sub(subComp):
+    verify_indent(ref_subComp, subComp)