提交: 5861d35f51411331f01e9ac4cf7965d3599977b8 - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: 5861d35f51411331f01e9ac4cf7965d3599977b8 (tree)
• 時間: 2024-03-02 00:46:50
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

ASIS: activated some (ASIDE) TestDoubles/AIGR into TestDoubles-aigr-sieve package (BUSY)

Change Summary

• modified: TestDoubles_packages/TestDoubles-aigr-sieve/Makefile
• modified: TestDoubles_packages/TestDoubles-aigr-sieve/pytst/test_0_dummy.py
• add: TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/base/__init__.py
• add: TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/protocols.py
• add: TestDoubles_packages/TestDoubles-aigr-sieve/pytst/test_1_sieve_protocols.py
• delete: ASIDE/TestDoubles/AIGR/base/__init__.py
• delete: ASIDE/TestDoubles/AIGR/sieve/protocols.py
• delete: ASIDE/TestDoubles/TD_AIGR/test_1_sieve_protocols.py

差異

diff -r efdc2cb9cf60 -r 5861d35f5141 ASIDE/TestDoubles/AIGR/base/__init__.py
--- a/ASIDE/TestDoubles/AIGR/base/__init__.py	Thu Feb 29 14:34:04 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-""".. Note:: The baseProtocol (instance) is used in aigr.protocols as top of all protocols. So we can import & use it.
-      No such 'top-namespaces' exist, so we have to initiate it here.
-"""
-
-from castle.aigr.protocols import baseProtocol, ID
-from castle.aigr import NameSpace
-
-Protocol = baseProtocol
-
-base = NameSpace(ID('base'))
-base.register(Protocol)
-

diff -r efdc2cb9cf60 -r 5861d35f5141 ASIDE/TestDoubles/AIGR/sieve/protocols.py
--- a/ASIDE/TestDoubles/AIGR/sieve/protocols.py	Thu Feb 29 14:34:04 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-from castle.aigr import EventProtocol, Event, ID
-from castle.aigr.protocols import ProtocolWrapper
-from castle.aigr.aid import TypedParameter, Argument
-
-
-StartSieve = EventProtocol(ID('StartSieve'),
-                              events=(
-                                   Event(name=ID('runTo'),  return_type=None, typedParameters=(TypedParameter(name='max', type=int),)),
-                                   Event(name=ID('newMax'), return_type=None, typedParameters=(TypedParameter(name='max', type=int),))))
-
-
-SlowStart = EventProtocol(ID('SlowStart'),
-                              typedParameters=(TypedParameter(name='queue_max', type=int),),
-                              events=(
-                                   Event(name=ID('setMax'), return_type=None, typedParameters=(TypedParameter(name='queue_max', type=int),)),))
-
-SlowStart_1 = ProtocolWrapper(ID("SlowStart_1"),
-                              based_on=SlowStart,
-                              #OR: arguments=(Argument(name=queue_max, value=1),))
-                              arguments=(Argument(value=1),))
-
-SimpleSieve = EventProtocol(ID('SimpleSieve'),
-                              based_on=SlowStart_1,
-                              events=(
-                                   Event(name=ID('input'), return_type=None, typedParameters=(TypedParameter(name='try', type=int),)),))
-
-

diff -r efdc2cb9cf60 -r 5861d35f5141 ASIDE/TestDoubles/TD_AIGR/test_1_sieve_protocols.py
--- a/ASIDE/TestDoubles/TD_AIGR/test_1_sieve_protocols.py	Thu Feb 29 14:34:04 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-"""Test AIGR representation of the TheSieve protocols
-   See: http://docideas.mietus.nl/en/default/CCastle/4.Blog/b.TheSieve.html#the-design
-"""
-
-import pytest
-
-import castle.aigr as aigr
-from TestDoubles.AIGR.sieve import protocols
-from TestDoubles.AIGR.base import Protocol  as base_Protocol
-
-
-def verify_Protocol(p, name, event_names, base=None, no_events=None, cls=None):
-    if base is None:
-        base=base_Protocol
-    if no_events is None:
-        no_events = len(event_names)
-    if cls is None:
-        cls = aigr.EventProtocol
-
-    assert isinstance(p, cls)
-    assert p.name == name
-    assert p.based_on is base
-    assert p._noEvents() == no_events
-    for no, name in enumerate(event_names):
-        assert p.events[no].name == name
-
-
-
-def test_StartSieve():
-    p = protocols.StartSieve
-    verify_Protocol(p, name="StartSieve", event_names=('runTo', 'newMax'))
-
-def test_SlowStart():
-    p = protocols.SlowStart
-    verify_Protocol(p, name="SlowStart", event_names=['setMax'])
-
-def test_SlowStart_1():
-    from castle.aigr.protocols import ProtocolWrapper
-    p = protocols.SlowStart_1
-    verify_Protocol(p, name="SlowStart_1", cls=ProtocolWrapper, base=protocols.SlowStart, event_names=['setMax'])
-
-def test_SimpleSieve():
-    p = protocols.SimpleSieve
-    verify_Protocol(p, name="SimpleSieve", base=protocols.SlowStart_1, event_names=['input'])
-
-
-

diff -r efdc2cb9cf60 -r 5861d35f5141 TestDoubles_packages/TestDoubles-aigr-sieve/Makefile
--- a/TestDoubles_packages/TestDoubles-aigr-sieve/Makefile	Thu Feb 29 14:34:04 2024 +0100
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/Makefile	Fri Mar 01 16:46:50 2024 +0100
@@ -3,8 +3,10 @@
 PYREVERSE_PKGS = castle.TESTDOUBLES.aigr.sieve
 
 LAST = \
+	pytst/test_0_dummy.py			\
 #
 CURRENT = \
+	pytst/test_1_sieve_protocols.py		\
 #
 
 TODO = \

diff -r efdc2cb9cf60 -r 5861d35f5141 TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/base/__init__.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/base/__init__.py	Fri Mar 01 16:46:50 2024 +0100
@@ -0,0 +1,14 @@
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+""".. Note:: The baseProtocol (instance) is used in aigr.protocols as top of all protocols. So we can import & use it.
+      No such 'top-namespaces' exist, so we have to initiate it here.
+"""
+
+from castle.aigr.protocols import baseProtocol, ID
+from castle.aigr import NameSpace
+
+Protocol = baseProtocol
+
+base = NameSpace(ID('base'))
+base.register(Protocol)
+

diff -r efdc2cb9cf60 -r 5861d35f5141 TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/protocols.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/protocols.py	Fri Mar 01 16:46:50 2024 +0100
@@ -0,0 +1,29 @@
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+from castle.aigr import EventProtocol, Event, ID
+from castle.aigr.protocols import ProtocolWrapper
+from castle.aigr.aid import TypedParameter, Argument
+
+
+StartSieve = EventProtocol(ID('StartSieve'),
+                              events=(
+                                   Event(name=ID('runTo'),  return_type=None, typedParameters=(TypedParameter(name='max', type=int),)),
+                                   Event(name=ID('newMax'), return_type=None, typedParameters=(TypedParameter(name='max', type=int),))))
+
+
+SlowStart = EventProtocol(ID('SlowStart'),
+                              typedParameters=(TypedParameter(name='queue_max', type=int),),
+                              events=(
+                                   Event(name=ID('setMax'), return_type=None, typedParameters=(TypedParameter(name='queue_max', type=int),)),))
+
+SlowStart_1 = ProtocolWrapper(ID("SlowStart_1"),
+                              based_on=SlowStart,
+                              #OR: arguments=(Argument(name=queue_max, value=1),))
+                              arguments=(Argument(value=1),))
+
+SimpleSieve = EventProtocol(ID('SimpleSieve'),
+                              based_on=SlowStart_1,
+                              events=(
+                                   Event(name=ID('input'), return_type=None, typedParameters=(TypedParameter(name='try', type=int),)),))
+
+

diff -r efdc2cb9cf60 -r 5861d35f5141 TestDoubles_packages/TestDoubles-aigr-sieve/pytst/test_0_dummy.py
--- a/TestDoubles_packages/TestDoubles-aigr-sieve/pytst/test_0_dummy.py	Thu Feb 29 14:34:04 2024 +0100
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/pytst/test_0_dummy.py	Fri Mar 01 16:46:50 2024 +0100
@@ -1,2 +1,26 @@
+# (C) Albert Mietus, 2023,2024 Part of Castle/CCastle project
+"""Check that the  AIGR TestDoubles  'the sieve' are available
+   See: http://docideas.mietus.nl/en/default/CCastle/4.Blog/b.TheSieve.html#the-design
+   See 'test_1... (and more) for in-depth tests"
+"""
+
+
+import pytest
+
+import castle.aigr as aigr
+from castle.TESTDOUBLES.aigr.sieve import protocols
+from castle.TESTDOUBLES.aigr.base  import Protocol as base_Protocol
+
+
 def test_0_Oke():
     return
+
+def test_1_all_sieveProtocols():
+    for p in (protocols.StartSieve, protocols.SlowStart, protocols.SimpleSieve):
+        assert isinstance(p, aigr.EventProtocol)
+
+    for p in (protocols.SlowStart_1,):
+        assert isinstance(p, aigr.protocols.ProtocolWrapper) # ProtocolWrapper isn't exported
+
+def test_2_baseProtocol():
+    assert isinstance(base_Protocol, aigr.Protocol)

diff -r efdc2cb9cf60 -r 5861d35f5141 TestDoubles_packages/TestDoubles-aigr-sieve/pytst/test_1_sieve_protocols.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/pytst/test_1_sieve_protocols.py	Fri Mar 01 16:46:50 2024 +0100
@@ -0,0 +1,48 @@
+# (C) Albert Mietus, 2023,2024 Part of Castle/CCastle project
+"""Test the AIGR TestDoubles of the Sieve protocols
+   See: http://docideas.mietus.nl/en/default/CCastle/4.Blog/b.TheSieve.html#the-design
+"""
+
+import pytest
+
+import castle.aigr as aigr
+from castle.TESTDOUBLES.aigr.sieve import protocols
+from castle.TESTDOUBLES.aigr.base  import Protocol as base_Protocol
+
+
+def verify_Protocol(p, name, event_names, base=None, no_events=None, cls=None):
+    if base is None:
+        base=base_Protocol
+    if no_events is None:
+        no_events = len(event_names)
+    if cls is None:
+        cls = aigr.EventProtocol
+
+    assert isinstance(p, cls)
+    assert p.name == name
+    assert p.based_on is base
+    assert p._noEvents() == no_events
+    for no, name in enumerate(event_names):
+        assert p.events[no].name == name
+
+
+
+def test_StartSieve():
+    p = protocols.StartSieve
+    verify_Protocol(p, name="StartSieve", event_names=('runTo', 'newMax'))
+
+def test_SlowStart():
+    p = protocols.SlowStart
+    verify_Protocol(p, name="SlowStart", event_names=['setMax'])
+
+def test_SlowStart_1():
+    from castle.aigr.protocols import ProtocolWrapper
+    p = protocols.SlowStart_1
+    verify_Protocol(p, name="SlowStart_1", cls=ProtocolWrapper, base=protocols.SlowStart, event_names=['setMax'])
+
+def test_SimpleSieve():
+    p = protocols.SimpleSieve
+    verify_Protocol(p, name="SimpleSieve", base=protocols.SlowStart_1, event_names=['input'])
+
+
+