提交: 98a6dee6a936ec573fab1c54211db9f82bfdc456 - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: 98a6dee6a936ec573fab1c54211db9f82bfdc456 (tree)
• 時間: 2024-03-02 03:25:43
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

castle-RPy-writer updated: More TestDoubles added

Change Summary

• modified: core_packages/castle-RPy-writer/Makefile
• modified: core_packages/castle-RPy-writer/pytst/__init__.py
• modified: core_packages/castle-RPy-writer/pytst/test_3_SieveProtocols.py
• modified: core_packages/castle-RPy-writer/pytst/test_4_NameSpaces.py
• modified: core_packages/castle-RPy-writer/pytst/test_99_SieveMoats.py
• add: core_packages/castle-RPy-writer/pytst/TestDoubles/_generated/protocols/_keepThisDir
• add: core_packages/castle-RPy-writer/pytst/TestDoubles/reference/interfaces/SieveMoat.rpy
• add: core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/_keepThisDir
• add: core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/simple_sieve.rpy
• add: core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/slow_start.rpy
• add: core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/start_sieve.rpy
• delete: ASIDE/TestDoubles/_generated/protocols/_keepThisDir
• delete: ASIDE/TestDoubles/reference/interfaces/SieveMoat.rpy
• delete: ASIDE/TestDoubles/reference/protocols/_keepThisDir
• delete: ASIDE/TestDoubles/reference/protocols/simple_sieve.rpy
• delete: ASIDE/TestDoubles/reference/protocols/slow_start.rpy
• delete: ASIDE/TestDoubles/reference/protocols/start_sieve.rpy

差異

diff -r 45c3b14deeae -r 98a6dee6a936 ASIDE/TestDoubles/_generated/protocols/_keepThisDir
--- a/ASIDE/TestDoubles/_generated/protocols/_keepThisDir	Fri Mar 01 18:14:45 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-This directory is needed to store generated/rendered files (which is an option during testing)
-.. note:: a "mirror" of this file is found in :dir:`reference` -- to be able to diff dirs
\ No newline at end of file

diff -r 45c3b14deeae -r 98a6dee6a936 ASIDE/TestDoubles/reference/interfaces/SieveMoat.rpy
--- a/ASIDE/TestDoubles/reference/interfaces/SieveMoat.rpy	Fri Mar 01 18:14:45 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# -*- python -*-
-# Generated (R)Python file
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-####
-from CC import buildin
-from CC import base
-
-#Put the Castle/generated imports here
-import SimpleSieve
-
-
-cc_CI_Sieve = buildin.CC_B_ComponentInterface(name="Sieve",
-                                inherit_from=base.cc_CI_Component,
-                                ports=[])
-
-cc_CI_Sieve.ports.append(buildin.CC_B_C_PortID(name="try",
-                                portNo=2,   # XXXX
-                                protocol=SimpleSieve.cc_P_SimpleSieve,
-                                direction=buildin.PortDirection.In,
-                                part_of=cc_CI_Sieve))
-cc_CI_Sieve.ports.append(buildin.CC_B_C_PortID(name="coprime",
-                                portNo=3,      #XXX
-                                protocol=SimpleSieve.cc_P_SimpleSieve,
-                                direction=buildin.CC_B_PortDirection.Out,
-                                part_of=cc_CI_Sieve))
-

diff -r 45c3b14deeae -r 98a6dee6a936 ASIDE/TestDoubles/reference/protocols/_keepThisDir
--- a/ASIDE/TestDoubles/reference/protocols/_keepThisDir	Fri Mar 01 18:14:45 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-This directory is needed to store generated/rendered files (which is an option during testing)
-.. note:: a "mirror" of this file is found in :dir:`reference` -- to be able to diff dirs
\ No newline at end of file

diff -r 45c3b14deeae -r 98a6dee6a936 ASIDE/TestDoubles/reference/protocols/simple_sieve.rpy
--- a/ASIDE/TestDoubles/reference/protocols/simple_sieve.rpy	Fri Mar 01 18:14:45 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-# -*- python -*-
-# Generated (R)Python file
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-####
-from CC import buildin
-
-#Put the Castle/generated imports here
-from CC import base
-from CC import slow_start
-
-
-
-##
-## EventIndexes (All 1 events of SlowStart_1)
-##
-
-CC_P_SlowStart_1_setMax = 0
-
-
-##
-## EventIndexes (All 1 events of SimpleSieve)
-##
-
-CC_P_SimpleSieve_input = 1
-
-
-##
-## The protocol Data Definitions for SlowStart_1 -- with 1 events
-##
-
-cc_P_SlowStart_1 = buildin.CC_B_Protocol(name="SlowStart_1",
-                                kind=buildin.ProtocolKind.Event,
-                                inherit_from=slow_start.cc_P_SlowStart,
-                                events=[])
-
-cc_P_SlowStart_1.events.append(buildin.CC_B_P_EventID(name="setMax",
-                                seqNo=CC_P_SlowStart_1_setMax,
-                                part_of=cc_P_SlowStart_1))
-
-##
-## The protocol Data Definitions for SimpleSieve -- with 1 events
-##
-
-cc_P_SimpleSieve = buildin.CC_B_Protocol(name="SimpleSieve",
-                                kind=buildin.ProtocolKind.Event,
-                                inherit_from=cc_P_SlowStart_1,
-                                events=[])
-
-cc_P_SimpleSieve.events.append(buildin.CC_B_P_EventID(name="input",
-                                seqNo=CC_P_SimpleSieve_input,
-                                part_of=cc_P_SimpleSieve))
-

diff -r 45c3b14deeae -r 98a6dee6a936 ASIDE/TestDoubles/reference/protocols/slow_start.rpy
--- a/ASIDE/TestDoubles/reference/protocols/slow_start.rpy	Fri Mar 01 18:14:45 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# -*- python -*-
-# Generated (R)Python file
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-####
-from CC import buildin
-
-#Put the Castle/generated imports here
-from CC import base
-
-
-
-##
-## EventIndexes (All 1 events of SlowStart)
-##
-
-CC_P_SlowStart_setMax = 0
-
-
-##
-## The protocol Data Definitions for SlowStart -- with 1 events
-##
-
-cc_P_SlowStart = buildin.CC_B_Protocol(name="SlowStart",
-                                parameters=(
-                                    ('queue_max', int),
-                                ),
-                                kind=buildin.ProtocolKind.Event,
-                                inherit_from=base.cc_P_Protocol,
-                                events=[])
-
-cc_P_SlowStart.events.append(buildin.CC_B_P_EventID(name="setMax",
-                                seqNo=CC_P_SlowStart_setMax,
-                                part_of=cc_P_SlowStart))
-

diff -r 45c3b14deeae -r 98a6dee6a936 ASIDE/TestDoubles/reference/protocols/start_sieve.rpy
--- a/ASIDE/TestDoubles/reference/protocols/start_sieve.rpy	Fri Mar 01 18:14:45 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-# -*- python -*-
-# Generated (R)Python file
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-####
-from CC import buildin
-
-#Put the Castle/generated imports here
-from CC import base
-
-
-
-##
-## EventIndexes (All 2 events of StartSieve)
-##
-
-CC_P_StartSieve_runTo = 0
-CC_P_StartSieve_newMax = 1
-
-
-##
-## The protocol Data Definitions for StartSieve -- with 2 events
-##
-
-cc_P_StartSieve = buildin.CC_B_Protocol(name="StartSieve",
-                                kind=buildin.ProtocolKind.Event,
-                                inherit_from=base.cc_P_Protocol,
-                                events=[])
-
-cc_P_StartSieve.events.append(buildin.CC_B_P_EventID(name="runTo",
-                                seqNo=CC_P_StartSieve_runTo,
-                                part_of=cc_P_StartSieve))
-cc_P_StartSieve.events.append(buildin.CC_B_P_EventID(name="newMax",
-                                seqNo=CC_P_StartSieve_newMax,
-                                part_of=cc_P_StartSieve))
-

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/Makefile
--- a/core_packages/castle-RPy-writer/Makefile	Fri Mar 01 18:14:45 2024 +0100
+++ b/core_packages/castle-RPy-writer/Makefile	Fri Mar 01 19:25:43 2024 +0100
@@ -5,17 +5,15 @@
 
 LAST = \
 	pytst/test_0_templating.py			\
-#
-CURRENT = \
 	pytst/test_1_EventIndexes.py 			\
 	pytst/test_2_ProtocolDataStructures.py		\
-	pytst/test_999.py 				\
+	pytst/test_3_SieveProtocols.py			\
+#
+CURRENT = \
+	pytst/test_4_NameSpaces.py			\
 #
 
-## test 3,4,99  are using TestDoubles/AIGR
 TODO = \
-	pytst/test_3_SieveProtocols.py			\
-	pytst/test_4_NameSpaces.py			\
 	pytst/test_99_SieveMoats.py			\
 #
 

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/TestDoubles/_generated/protocols/_keepThisDir
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core_packages/castle-RPy-writer/pytst/TestDoubles/_generated/protocols/_keepThisDir	Fri Mar 01 19:25:43 2024 +0100
@@ -0,0 +1,2 @@
+This directory is needed to store generated/rendered files (which is an option during testing)
+.. note:: a "mirror" of this file is found in :dir:`reference` -- to be able to diff dirs
\ No newline at end of file

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/TestDoubles/reference/interfaces/SieveMoat.rpy
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core_packages/castle-RPy-writer/pytst/TestDoubles/reference/interfaces/SieveMoat.rpy	Fri Mar 01 19:25:43 2024 +0100
@@ -0,0 +1,27 @@
+# -*- python -*-
+# Generated (R)Python file
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+####
+from CC import buildin
+from CC import base
+
+#Put the Castle/generated imports here
+import SimpleSieve
+
+
+cc_CI_Sieve = buildin.CC_B_ComponentInterface(name="Sieve",
+                                inherit_from=base.cc_CI_Component,
+                                ports=[])
+
+cc_CI_Sieve.ports.append(buildin.CC_B_C_PortID(name="try",
+                                portNo=2,   # XXXX
+                                protocol=SimpleSieve.cc_P_SimpleSieve,
+                                direction=buildin.PortDirection.In,
+                                part_of=cc_CI_Sieve))
+cc_CI_Sieve.ports.append(buildin.CC_B_C_PortID(name="coprime",
+                                portNo=3,      #XXX
+                                protocol=SimpleSieve.cc_P_SimpleSieve,
+                                direction=buildin.CC_B_PortDirection.Out,
+                                part_of=cc_CI_Sieve))
+

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/_keepThisDir
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/_keepThisDir	Fri Mar 01 19:25:43 2024 +0100
@@ -0,0 +1,2 @@
+This directory is needed to store generated/rendered files (which is an option during testing)
+.. note:: a "mirror" of this file is found in :dir:`reference` -- to be able to diff dirs
\ No newline at end of file

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/simple_sieve.rpy
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/simple_sieve.rpy	Fri Mar 01 19:25:43 2024 +0100
@@ -0,0 +1,53 @@
+# -*- python -*-
+# Generated (R)Python file
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+####
+from CC import buildin
+
+#Put the Castle/generated imports here
+from CC import base
+from CC import slow_start
+
+
+
+##
+## EventIndexes (All 1 events of SlowStart_1)
+##
+
+CC_P_SlowStart_1_setMax = 0
+
+
+##
+## EventIndexes (All 1 events of SimpleSieve)
+##
+
+CC_P_SimpleSieve_input = 1
+
+
+##
+## The protocol Data Definitions for SlowStart_1 -- with 1 events
+##
+
+cc_P_SlowStart_1 = buildin.CC_B_Protocol(name="SlowStart_1",
+                                kind=buildin.ProtocolKind.Event,
+                                inherit_from=slow_start.cc_P_SlowStart,
+                                events=[])
+
+cc_P_SlowStart_1.events.append(buildin.CC_B_P_EventID(name="setMax",
+                                seqNo=CC_P_SlowStart_1_setMax,
+                                part_of=cc_P_SlowStart_1))
+
+##
+## The protocol Data Definitions for SimpleSieve -- with 1 events
+##
+
+cc_P_SimpleSieve = buildin.CC_B_Protocol(name="SimpleSieve",
+                                kind=buildin.ProtocolKind.Event,
+                                inherit_from=cc_P_SlowStart_1,
+                                events=[])
+
+cc_P_SimpleSieve.events.append(buildin.CC_B_P_EventID(name="input",
+                                seqNo=CC_P_SimpleSieve_input,
+                                part_of=cc_P_SimpleSieve))
+

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/slow_start.rpy
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/slow_start.rpy	Fri Mar 01 19:25:43 2024 +0100
@@ -0,0 +1,35 @@
+# -*- python -*-
+# Generated (R)Python file
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+####
+from CC import buildin
+
+#Put the Castle/generated imports here
+from CC import base
+
+
+
+##
+## EventIndexes (All 1 events of SlowStart)
+##
+
+CC_P_SlowStart_setMax = 0
+
+
+##
+## The protocol Data Definitions for SlowStart -- with 1 events
+##
+
+cc_P_SlowStart = buildin.CC_B_Protocol(name="SlowStart",
+                                parameters=(
+                                    ('queue_max', int),
+                                ),
+                                kind=buildin.ProtocolKind.Event,
+                                inherit_from=base.cc_P_Protocol,
+                                events=[])
+
+cc_P_SlowStart.events.append(buildin.CC_B_P_EventID(name="setMax",
+                                seqNo=CC_P_SlowStart_setMax,
+                                part_of=cc_P_SlowStart))
+

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/start_sieve.rpy
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core_packages/castle-RPy-writer/pytst/TestDoubles/reference/protocols/start_sieve.rpy	Fri Mar 01 19:25:43 2024 +0100
@@ -0,0 +1,36 @@
+# -*- python -*-
+# Generated (R)Python file
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+####
+from CC import buildin
+
+#Put the Castle/generated imports here
+from CC import base
+
+
+
+##
+## EventIndexes (All 2 events of StartSieve)
+##
+
+CC_P_StartSieve_runTo = 0
+CC_P_StartSieve_newMax = 1
+
+
+##
+## The protocol Data Definitions for StartSieve -- with 2 events
+##
+
+cc_P_StartSieve = buildin.CC_B_Protocol(name="StartSieve",
+                                kind=buildin.ProtocolKind.Event,
+                                inherit_from=base.cc_P_Protocol,
+                                events=[])
+
+cc_P_StartSieve.events.append(buildin.CC_B_P_EventID(name="runTo",
+                                seqNo=CC_P_StartSieve_runTo,
+                                part_of=cc_P_StartSieve))
+cc_P_StartSieve.events.append(buildin.CC_B_P_EventID(name="newMax",
+                                seqNo=CC_P_StartSieve_newMax,
+                                part_of=cc_P_StartSieve))
+

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/__init__.py
--- a/core_packages/castle-RPy-writer/pytst/__init__.py	Fri Mar 01 18:14:45 2024 +0100
+++ b/core_packages/castle-RPy-writer/pytst/__init__.py	Fri Mar 01 19:25:43 2024 +0100
@@ -46,7 +46,7 @@
 
 
 class TstDoubles():
-    _top = Path('TestDoubles')
+    _top = Path('pytst/TestDoubles')
     _ref = Path('reference')
     _gen = Path('_generated')
 
@@ -121,7 +121,6 @@
      return protocol_matcher
 
 
-
 @pytest.fixture
 def generatedMoat_verifier(T_Moat):
     assert False, "To Busy with other things"

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/test_3_SieveProtocols.py
--- a/core_packages/castle-RPy-writer/pytst/test_3_SieveProtocols.py	Fri Mar 01 18:14:45 2024 +0100
+++ b/core_packages/castle-RPy-writer/pytst/test_3_SieveProtocols.py	Fri Mar 01 19:25:43 2024 +0100
@@ -8,14 +8,11 @@
      to diff line-by-line (for debugging)
 """
 
-import logging; logger = logging.getLogger(__name__)
 import pytest
+from castle.TESTDOUBLES.aigr import sieve 
 
-from TestDoubles.AIGR import sieve
-from . import TstDoubles, generatedProtocol_verifier
+from . import TstDoubles, generatedProtocol_verifier, T_Protocol
 ##Note: T_* are used in **_verifier; but need to be in this scope (or pytest can't find it)
-from . import T_Protocol
-
 
 
 def test_01_StartSieve(generatedProtocol_verifier):

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/test_4_NameSpaces.py
--- a/core_packages/castle-RPy-writer/pytst/test_4_NameSpaces.py	Fri Mar 01 18:14:45 2024 +0100
+++ b/core_packages/castle-RPy-writer/pytst/test_4_NameSpaces.py	Fri Mar 01 19:25:43 2024 +0100
@@ -2,11 +2,10 @@
 import logging; logger = logging.getLogger(__name__)
 
 import pytest
-from TestDoubles.AIGR import sieve
-from . import TstDoubles
+from castle.TESTDOUBLES.aigr import sieve 
+
+from . import TstDoubles, generatedProtocol_verifier,  T_Moat
 ##Note: T_* are used in **_verifier; but need to be in this scope (or pytest can't find it)
-from . import T_Protocol, T_Moat
-
 
 @pytest.mark.skip(reason="ToDo")
 def test_0():

diff -r 45c3b14deeae -r 98a6dee6a936 core_packages/castle-RPy-writer/pytst/test_99_SieveMoats.py
--- a/core_packages/castle-RPy-writer/pytst/test_99_SieveMoats.py	Fri Mar 01 18:14:45 2024 +0100
+++ b/core_packages/castle-RPy-writer/pytst/test_99_SieveMoats.py	Fri Mar 01 19:25:43 2024 +0100
@@ -1,15 +1,13 @@
 # (C) Albert Mietus, 2023. Part of Castle/CCastle project
-import logging; logger = logging.getLogger(__name__)
 
 import pytest
-from TestDoubles.AIGR import sieve
-from . import TstDoubles, generatedMoat_verifier
+from castle.TESTDOUBLES.aigr import sieve
+
+from . import TstDoubles, generatedMoat_verifier, T_Moat
 ##Note: T_* are used in **_verifier; but need to be in this scope (or pytest can't find it)
-from . import T_Protocol, T_Moat
 
[e-mail](reason="To Busy with other things")
[e-mail](reason="To Busy with other things")
 def test_04_SieveMoat(generatedMoat_verifier):
     generatedMoat_verifier(aigr_mock=sieve.SieveMoat, td=TstDoubles('interfaces/SieveMoat'))
-
     assert False, "Not Done"