提交: fd68262da007587f8f686a4dfac7f578f01f96c9 - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: fd68262da007587f8f686a4dfac7f578f01f96c9 (tree)
• 时间: 2023-11-01 01:40:13
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

BUSY --RPy: Protocol-rendering some test work. Need more work

更改概述

• modified: Makefile
• modified: TestDoubles/reference/protocols/SimpleSieve.rpy
• modified: TestDoubles/reference/protocols/SlowStart.rpy
• modified: TestDoubles/reference/protocols/SlowStart_1.rpy
• modified: TestDoubles/reference/protocols/StartSieve.rpy
• modified: castle/writers/RPy/templates/parts/protocol_imports.jinja2
• modified: castle/writers/RPy/templates/protocol.jinja2
• modified: pytst/TD_AIGR/test_2_sieve_NS.py
• modified: pytst/writers/RPy/test_3_SieveProtocols.py

差异

diff -r 5d6a8e06035c -r fd68262da007 Makefile
--- a/Makefile	Tue Oct 31 14:29:52 2023 +0100
+++ b/Makefile	Tue Oct 31 17:40:13 2023 +0100
@@ -10,22 +10,12 @@
 # CURRENT:	The now current test, in TDD phase
 # TODO:		Some test that are needed soon
 rPY_LAST = \
-	pytst/aigr/test_0_AIGR.py				\
-	pytst/writers/RPy/test_1_EventIndexes.py		\
-	pytst/aigr/test_2a_protocolKind.py			\
-	pytst/aigr/test_2b_protocol.py				\
-	pytst/writers/RPy/test_0_templating.py			\
-	pytst/writers/RPy/test_1_EventIndexes.py		\
-	pytst/writers/RPy/test_2_ProtocolDataStructures.py	\
-	pytst/aigr/test_2c_GenericProtocols.py			\
-	pytst/aigr/test_0_aid.py				\
-	pytst/TD_AIGR/test_0_base.py				\
-	pytst/TD_AIGR/test_1_sieve_protocols.py			\
+	pytst/aigr/test_3_namespaces.py				\
+	pytst/TD_AIGR/test_2_sieve_NS.py			\
 #
 rPY_CURRENT = \
 	pytst/writers/RPy/test_3_SieveProtocols.py		\
-	pytst/aigr/test_3_namespaces.py				\
-	pytst/TD_AIGR/test_2_sieve_NS.py			\
+
 #
 CC2CPy_TODO = \
 	pytst/aigr/test_3_namespaces.py				\
@@ -40,6 +30,8 @@
 include Mk/helpful.mk
 include Mk/mypy.mk
 
+GAM: clean_generated current-only diff_TestDoubles
+
 missing: missing_visitor missing_serialization
 open:    coverage-open mutmut-open
 remake:  veryclean coverage mutmut open

diff -r 5d6a8e06035c -r fd68262da007 TestDoubles/reference/protocols/SimpleSieve.rpy
--- a/TestDoubles/reference/protocols/SimpleSieve.rpy	Tue Oct 31 14:29:52 2023 +0100
+++ b/TestDoubles/reference/protocols/SimpleSieve.rpy	Tue Oct 31 17:40:13 2023 +0100
@@ -4,8 +4,9 @@
 
 ####
 from CC import buildin
+
+#Put the Castle/generated imports here
 from CC import base
-
 import SlowStart_1
 
 

diff -r 5d6a8e06035c -r fd68262da007 TestDoubles/reference/protocols/SlowStart.rpy
--- a/TestDoubles/reference/protocols/SlowStart.rpy	Tue Oct 31 14:29:52 2023 +0100
+++ b/TestDoubles/reference/protocols/SlowStart.rpy	Tue Oct 31 17:40:13 2023 +0100
@@ -4,10 +4,9 @@
 
 ####
 from CC import buildin
-from CC import base
 
 #Put the Castle/generated imports here
-
+from CC import base
 
 
 ##

diff -r 5d6a8e06035c -r fd68262da007 TestDoubles/reference/protocols/SlowStart_1.rpy
--- a/TestDoubles/reference/protocols/SlowStart_1.rpy	Tue Oct 31 14:29:52 2023 +0100
+++ b/TestDoubles/reference/protocols/SlowStart_1.rpy	Tue Oct 31 17:40:13 2023 +0100
@@ -4,8 +4,9 @@
 
 ####
 from CC import buildin
+
+#Put the Castle/generated imports here
 from CC import base
-
 import SlowStart
 
 

diff -r 5d6a8e06035c -r fd68262da007 TestDoubles/reference/protocols/StartSieve.rpy
--- a/TestDoubles/reference/protocols/StartSieve.rpy	Tue Oct 31 14:29:52 2023 +0100
+++ b/TestDoubles/reference/protocols/StartSieve.rpy	Tue Oct 31 17:40:13 2023 +0100
@@ -9,8 +9,6 @@
 from CC import base
 
 
-
-
 ##
 ## EventIndexes (All 2 events of StartSieve)
 ##

diff -r 5d6a8e06035c -r fd68262da007 castle/writers/RPy/templates/parts/protocol_imports.jinja2
--- a/castle/writers/RPy/templates/parts/protocol_imports.jinja2	Tue Oct 31 14:29:52 2023 +0100
+++ b/castle/writers/RPy/templates/parts/protocol_imports.jinja2	Tue Oct 31 17:40:13 2023 +0100
@@ -3,11 +3,11 @@
    * ``protocols``: PTH.Sequence[aigr.EventProtocol]
 #}
 
-{%- for proto in protocols %}
-  {% set p_ns = proto.ns %}
-  {% if p_ns is not none %}
+{%- for proto in protocols -%}
+  {%- set p_ns = proto.ns -%}
+  {%- if p_ns is not none -%}
     {%- for ns_name in p_ns.all_NS() -%}
       from CC import {{ ns_name }}   #XXX# This works, but is a bit simple
-    {% endfor %}
-    {% endif %}
-{% endfor %}
+    {%- endfor -%}
+    {%- endif -%}
+{%- endfor -%}

diff -r 5d6a8e06035c -r fd68262da007 castle/writers/RPy/templates/protocol.jinja2
--- a/castle/writers/RPy/templates/protocol.jinja2	Tue Oct 31 14:29:52 2023 +0100
+++ b/castle/writers/RPy/templates/protocol.jinja2	Tue Oct 31 17:40:13 2023 +0100
@@ -17,7 +17,6 @@
 {% include 'parts/protocol_imports.jinja2' %}
 {% endblock %}
 
-
 {% block EventIndexes %}
 {% for protocol in protocols %}
    {% set events = protocol.events %}

diff -r 5d6a8e06035c -r fd68262da007 pytst/TD_AIGR/test_2_sieve_NS.py
--- a/pytst/TD_AIGR/test_2_sieve_NS.py	Tue Oct 31 14:29:52 2023 +0100
+++ b/pytst/TD_AIGR/test_2_sieve_NS.py	Tue Oct 31 17:40:13 2023 +0100
@@ -1,8 +1,8 @@
 # (C) Albert Mietus, 2023. Part of Castle/CCastle project
 """Test AIGR representation of the TheSieve protocols
+
    See file:///Users/albert/work/DocIdeas,hg/__result/html/CCastle/HACK/DocParts/Design/231016_NS.html
-    (not published yet -- see .../DocParts/Design/231016_NS.rst for source)
-"""
+   (not published yet -- see .../DocParts/Design/231016_NS.rst for source)"""
 
 import pytest
 
@@ -15,25 +15,26 @@
     assert ns.name == as_name
     for n in registered_names:
         if isinstance(n, (list, tuple)):
-            #This is hardly/not used: be we support `import n[1] as n[0]`
+            # This is hardly/not used: but .... We support `import n[1] as n[0]`
             assert len(n) == 2
             name, asName = n[1], n[0]
         else:
             name, asName = n, n
         assert ns.getID(asName).name == name
 
-def test_start_sieve():
+def test_slow_start_has_SlowStart():
+    ns = namespaces.slow_start
+    verify_NS(ns, "slow_start", ["SlowStart"])
+
+def test_start_sieve_has_StartSieve():
     ns = namespaces.start_sieve
     verify_NS(ns, "start_sieve", ["StartSieve"])
 
-def test_slow_start():
-    ns = namespaces.slow_start
-    verify_NS(ns, "slow_start", ["SlowStart"])
-
-def test_simple_sieve():
+def test_simple_sieve_has_SimpleSieve_and_SpecialiseGeneric():
     ns = namespaces.simple_sieve
     verify_NS(ns, "simple_sieve", ["SlowStart_1", "SimpleSieve"])
 
+
 def test_top():
     ns = namespaces.top
     verify_NS(ns, "top", as_name='TheSieve', registered_names=('start_sieve', 'slow_start', 'simple_sieve'))

diff -r 5d6a8e06035c -r fd68262da007 pytst/writers/RPy/test_3_SieveProtocols.py
--- a/pytst/writers/RPy/test_3_SieveProtocols.py	Tue Oct 31 14:29:52 2023 +0100
+++ b/pytst/writers/RPy/test_3_SieveProtocols.py	Tue Oct 31 17:40:13 2023 +0100
@@ -21,20 +21,18 @@
 def test_01_StartSieve(generatedProtocol_verifier):
     generatedProtocol_verifier(aigr_mock=sieve.StartSieve, td=TstDoubles('protocols/StartSieve'), strip_remarker=True)
 
-
[e-mail]("Top one first")
[e-mail](reason="NS support in ``TestDoubles/reference/protocols/*``, not in code")
 def test_02_SlowStart(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=sieve.SlowStart, td=TstDoubles('protocols/SlowStart'))
+    generatedProtocol_verifier(aigr_mock=sieve.SlowStart, td=TstDoubles('protocols/SlowStart'), strip_remarker=True)
 
[e-mail]("Top one first")
[e-mail](reason="NS support in ``TestDoubles/reference/protocols/*``, not in code")
-def test_03a_SlowStart1(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=sieve.SlowStart_1, td=TstDoubles('protocols/SlowStart_1'))
+if False: # SlowStart1 and SimpleSieve are in the same NS, so in the same file
+    def test_03_SlowStart1(generatedProtocol_verifier):
+        generatedProtocol_verifier(aigr_mock=sieve.SlowStart_1, td=TstDoubles('protocols/SlowStart_1'), strip_remarker=True)
 
[e-mail]("Top one first")
[e-mail](reason="NS support in ``TestDoubles/reference/protocols/*``, not in code")
-def test_03b_SimpleSieve(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'))
+    def test_04_SimpleSieve(generatedProtocol_verifier):
+        generatedProtocol_verifier(aigr_mock=sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'), strip_remarker=True)
 
[e-mail]("ToDo: Merge")
+def test_03_SimpleSieve_withGeneric(generatedProtocol_verifier):
+    generatedProtocol_verifier(aigr_mock=(sieve.SlowStart_1, sieve.SimpleSieve), td=TstDoubles('protocols/SimpleSieve'), strip_remarker=True)
 
+    assert False, "Not yet done"