提交: 92840659a115f4cef0fe2f8ccd96bc6585245f29 - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: 92840659a115f4cef0fe2f8ccd96bc6585245f29 (tree)
• 时间: 2023-02-09 06:53:33
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

(asis) Refactor tests: ref_XX (txt) and fixtures/call to common.py. Some fixtures are now call()s

更改概述

• modified: pytst/writers/CC2Cpy/test_3c_CompClass.py
• add: pytst/writers/CC2Cpy/common.py

差异

diff -r 164ceaf64dff -r 92840659a115 pytst/writers/CC2Cpy/common.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pytst/writers/CC2Cpy/common.py	Wed Feb 08 22:53:33 2023 +0100
@@ -0,0 +1,82 @@
+# (C) Albert Mietus, 2022, 2023. Part of Castle/CCastle project
+
+import logging; logger = logging.getLogger(__name__)
+import pytest
+
+from castle.writers.CC2Cpy.Component import * # CC_B_ComponentInterface
+from castle.writers.CC2Cpy.Protocol import * #CC_EventProtocol
+
+########## empty ##########
+def emptyComp():
+    return CC_B_ComponentInterface('empty')
+
+ref_emptyComp="""\
+struct CC_B_ComponentInterface cc_CI_empty = {
+ .name          = "empty",
+ .inherit_from  = NULL,
+ .length        = 0,
+ .ports = {
+ },
+} ;
+"""
+
+ref_emptyClass="""\
+struct CC_B_ComponentClass  cc_C_empty = {
+ .isa           = NULL,
+ .interface     = &cc_CI_empty,
+ .instance_size = sizeof(CC_C_empty),
+ .methods       = cc_B_empty_methods,
+};
+"""
+
+########## demo2Comp ##########
+def demo2Comp():
+    jap = CC_EventProtocol("JustAProtocol", events=[], based_on=None)
+    return CC_B_ComponentInterface('demo2Comp', ports =[
+        CC_Port(name='no_1', type=None, direction=CC_PortDirection.In),
+        CC_Port(name='jap2', type=jap)])
+
+ref_demo2Comp="""\
+struct CC_B_ComponentInterface cc_CI_demo2Comp = {
+ .name          = "demo2Comp",
+ .inherit_from  = NULL,
+ .length        = 2,
+ .ports = {
+  {
+   .portNo    =  0,
+   .protocol  =  NULL,
+   .direction =  CC_B_PortDirectionIs_in,
+   .name      = "no_1",
+   .part_of   = &cc_CI_demo2Comp },
+  {
+   .portNo    =  1,
+   .protocol  = &cc_P_JustAProtocol,
+   .direction =  CC_B_PortDirectionIs_UNKNOWN,
+   .name      = "jap2",
+   .part_of   = &cc_CI_demo2Comp },
+ },
+} ;
+"""
+
+ref_demo2Class="""\
+struct CC_B_ComponentClass  cc_C_demo2Comp = {
+ .isa           = NULL,
+ .interface     = &cc_CI_demo2Comp,
+ .instance_size = sizeof(CC_C_demo2Comp),
+ .methods       = cc_B_demo2Comp_methods,
+};
+"""
+
+########## subComp ##########
+def subComp(base):
+    return CC_B_ComponentInterface('sub', based_on=base)
+
+ref_subComp="""\
+struct CC_B_ComponentInterface cc_CI_sub = {
+ .name          = "sub",
+ .inherit_from  = &cc_CI_demo2Comp,
+ .length        = 0,
+ .ports = {
+ },
+} ;
+"""

diff -r 164ceaf64dff -r 92840659a115 pytst/writers/CC2Cpy/test_3c_CompClass.py
--- a/pytst/writers/CC2Cpy/test_3c_CompClass.py	Wed Feb 08 21:48:48 2023 +0100
+++ b/pytst/writers/CC2Cpy/test_3c_CompClass.py	Wed Feb 08 22:53:33 2023 +0100
@@ -8,9 +8,26 @@
 
 from . import common
 
-def test_0():
-    emptyClass = CC_B_ComponentClass(common.emptyComp())
-    assert CCompare(common.ref_emptyClass, emptyClass.render())
+def test_1a_render_empty():
+    compClass = CC_B_ComponentClass(common.emptyComp())
+    assert CCompare(common.ref_emptyClass, compClass.render())
+
+def test_1a_render_demo2():
+    compClass = CC_B_ComponentClass(common.demo2Comp())
+    assert CCompare(common.ref_demo2Class, compClass.render())
+
+def test_2_render_whitespace():
+    assert CCompare(common.ref_emptyClass, CC_B_ComponentClass(common.emptyComp()).render())
+    assert CCompare(common.ref_emptyClass, CC_B_ComponentClass(common.emptyComp()).render_struct())
+
+def test_3a_indent_empty():
+    verify_indents(common.ref_emptyComp, common.emptyComp().render)
+
+def test_3b_indent_demo():
+    verify_indents(common.ref_demo2Comp, common.demo2Comp().render)
+
+def test_3c_indent_sub():
+    verify_indents(common.ref_subComp, common.subComp(base=common.demo2Comp()).render)