提交: 6fc5ffff747c9dc4400fb0e0d82560dae5f8933f - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: 6fc5ffff747c9dc4400fb0e0d82560dae5f8933f (tree)
• 时间: 2023-10-06 23:21:56
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

refacored TestDoubles/AIGR: all sieve files in one dir

更改概述

• modified: pytst/writers/RPy/test_99_SieveMoats.py
• add: TestDoubles/AIGR/sieve/__init__.py
• add: TestDoubles/AIGR/sieve/protocols.py
• delete: TestDoubles/AIGR/protocols/Sieve.py
• delete: TestDoubles/AIGR/protocols/__init__.py

差异

diff -r 1f992fa90cb0 -r 6fc5ffff747c TestDoubles/AIGR/protocols/Sieve.py
--- a/TestDoubles/AIGR/protocols/Sieve.py	Fri Oct 06 16:06:56 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-from castle.aigr.aid import TypedParameter
-from castle.aigr import EventProtocol, Event
-
-
-StartSieve = EventProtocol('StartSieve',
-                              events=[
-                                   Event(name='runTo',  return_type=None, typedParameters=(TypedParameter(name='max', type=int),)),
-                                   Event(name='newMax', return_type=None, typedParameters=(TypedParameter(name='max', type=int),))])
-
-SlowStart = EventProtocol('SlowStart',
-                              typedParameters=(TypedParameter(name='queue_max', type=int),),
-                              events=[
-                                   Event(name='setMax', return_type=None, typedParameters=(TypedParameter(name='queue_max', type=int),))])
-
-SimpleSieve = EventProtocol('SimpleSieve',
-                              based_on=SlowStart, # parm=1
-                              events=[
-                                   Event(name='input', return_type=None, typedParameters=(TypedParameter(name='try', type=int),))])
-
-

diff -r 1f992fa90cb0 -r 6fc5ffff747c TestDoubles/AIGR/protocols/__init__.py
--- a/TestDoubles/AIGR/protocols/__init__.py	Fri Oct 06 16:06:56 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# (C) Albert Mietus, 2023. Part of Castle/CCastle project
-
-from castle.aigr.aid import TypedParameter
-from castle.aigr import EventProtocol, Event
-
-from .Sieve import *

diff -r 1f992fa90cb0 -r 6fc5ffff747c TestDoubles/AIGR/sieve/__init__.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TestDoubles/AIGR/sieve/__init__.py	Fri Oct 06 16:21:56 2023 +0200
@@ -0,0 +1,3 @@
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+from .protocols import *

diff -r 1f992fa90cb0 -r 6fc5ffff747c TestDoubles/AIGR/sieve/protocols.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TestDoubles/AIGR/sieve/protocols.py	Fri Oct 06 16:21:56 2023 +0200
@@ -0,0 +1,22 @@
+# (C) Albert Mietus, 2023. Part of Castle/CCastle project
+
+from castle.aigr.aid import TypedParameter
+from castle.aigr import EventProtocol, Event
+
+
+StartSieve = EventProtocol('StartSieve',
+                              events=[
+                                   Event(name='runTo',  return_type=None, typedParameters=(TypedParameter(name='max', type=int),)),
+                                   Event(name='newMax', return_type=None, typedParameters=(TypedParameter(name='max', type=int),))])
+
+SlowStart = EventProtocol('SlowStart',
+                              typedParameters=(TypedParameter(name='queue_max', type=int),),
+                              events=[
+                                   Event(name='setMax', return_type=None, typedParameters=(TypedParameter(name='queue_max', type=int),))])
+
+SimpleSieve = EventProtocol('SimpleSieve',
+                              based_on=SlowStart, # parm=1
+                              events=[
+                                   Event(name='input', return_type=None, typedParameters=(TypedParameter(name='try', type=int),))])
+
+

diff -r 1f992fa90cb0 -r 6fc5ffff747c pytst/writers/RPy/test_99_SieveMoats.py
--- a/pytst/writers/RPy/test_99_SieveMoats.py	Fri Oct 06 16:06:56 2023 +0200
+++ b/pytst/writers/RPy/test_99_SieveMoats.py	Fri Oct 06 16:21:56 2023 +0200
@@ -2,7 +2,7 @@
 import logging; logger = logging.getLogger(__name__)
 
 import pytest
-from TestDoubles.AIGR.protocols import Sieve
+from TestDoubles.AIGR import sieve
 from . import TstDoubles, generatedProtocol_verifier, generatedMoat_verifier
 ##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
@@ -10,15 +10,17 @@
 SAVE_FILE=True
 
 def test_01_StartSieve(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=Sieve.StartSieve, td=TstDoubles('protocols/StartSieve'), save_file=SAVE_FILE)
+    generatedProtocol_verifier(aigr_mock=sieve.StartSieve, td=TstDoubles('protocols/StartSieve'), save_file=SAVE_FILE)
 
 def test_02_SlowStart(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=Sieve.SlowStart, td=TstDoubles('protocols/SlowStart'), save_file=SAVE_FILE)
+    generatedProtocol_verifier(aigr_mock=sieve.SlowStart, td=TstDoubles('protocols/SlowStart'), save_file=SAVE_FILE)
 
 def test_03_SimpleSieve(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=Sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'), save_file=SAVE_FILE)
+    generatedProtocol_verifier(aigr_mock=sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'), save_file=SAVE_FILE)
 
 @pytest.mark.xfail
 def test_04_SieveMoat(generatedMoat_verifier):
+    generatedMoat_verifier(aigr_mock="XXX")
     assert False
+