Commit: 59fa4cf9641095cbb58c4a0f8577b53976ca2a68 - CCastle2 (hg)

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

Commit MetaInfo

• Revisión: 59fa4cf9641095cbb58c4a0f8577b53976ca2a68 (tree)
• Tiempo: 2023-10-03 23:42:37
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

Added SimpleSieve to protocol-rendering

Cambiar Resumen

• modified: TestDoubles/AIGR/protocols/Sieve.py
• modified: pytst/writers/RPy/__init__.py
• modified: pytst/writers/RPy/test_99_SieveMoats.py
• add: TestDoubles/reference/protocols/SimpleSieve.rpy

Diferencia incremental

diff -r ee4c0d91abb0 -r 59fa4cf96410 TestDoubles/AIGR/protocols/Sieve.py
--- a/TestDoubles/AIGR/protocols/Sieve.py	Tue Oct 03 16:37:04 2023 +0200
+++ b/TestDoubles/AIGR/protocols/Sieve.py	Tue Oct 03 16:42:37 2023 +0200
@@ -6,15 +6,18 @@
 import pytest
 
 StartSieve = EventProtocol('StartSieve',
-                               events=[
+                              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),))],
-                              )
+                                   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 ee4c0d91abb0 -r 59fa4cf96410 TestDoubles/reference/protocols/SimpleSieve.rpy
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TestDoubles/reference/protocols/SimpleSieve.rpy	Tue Oct 03 16:42:37 2023 +0200
@@ -0,0 +1,28 @@
+# -*- 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
+
+
+
+##
+## EventIndexes (All 1 events of SimpleSieve)
+##
+
+CC_P_SimpleSieve_input = 1
+
+
+cc_P_SimpleSieve = buildin.CC_B_Protocol(name="SimpleSieve",
+                                kind=buildin.ProtocolKind.Event,
+                                inherit_from=cc_P_SlowStart,
+                                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 ee4c0d91abb0 -r 59fa4cf96410 pytst/writers/RPy/__init__.py
--- a/pytst/writers/RPy/__init__.py	Tue Oct 03 16:37:04 2023 +0200
+++ b/pytst/writers/RPy/__init__.py	Tue Oct 03 16:42:37 2023 +0200
@@ -42,7 +42,7 @@
 class TstDoubles():
     _top = Path('TestDoubles')
     _ref = Path('reference')
-    #_ref = Path('_generated')             #Not used anymore
+    _gen = Path('_generated')
 
     def __init__(self, base_name):
        self.base_name = Path(base_name)
@@ -51,15 +51,27 @@
     def ref_file(self, ext='.rpy'):
         return self._top / self._ref / self.base_name.with_suffix(ext)
 
-    #@property
-    #def gen_file(self, ext='.rpy'):
-    #    return self._top / self._gen / self.base_name.with_suffix(ext)
+    @property
+    def gen_file(self, ext='.rpy'):
+        return self._top / self._gen / self.base_name.with_suffix(ext)
 
 
 @pytest.fixture
 def generatedProtocol_verifier(T_Protocol):
-     def matcher(aigr_mock, td):
+     def matcher(aigr_mock, td, save_file=False):
         out = T_Protocol.render(protocols=(aigr_mock,))
+        logger.debug("---------- out: (%s)----------\n%s", aigr_mock, out)
+        if save_file:
+            with open(td.gen_file, 'w') as f:
+                f.write(out)
+            logger.info("Saved rendered protocol in: %s", td.gen_file)
         ref = open(td.ref_file).read()
-        assert out == ref
+        logger.debug("---------- ref: ----------\n%s\n==========================", out)
+
+        #assert line by line: gives better feedback when they do not match
+        for n, (o,r) in enumerate(zip(out.splitlines(keepends=True), ref.splitlines(keepends=True), strict=True)):
+            assert o == r, "line %s does not match: >>%s<< != <<%s>>" % (n, o.strip('\n'), r.strip('\n'))
+        assert out == ref                 #Should be needed
      return matcher
+
+

diff -r ee4c0d91abb0 -r 59fa4cf96410 pytst/writers/RPy/test_99_SieveMoats.py
--- a/pytst/writers/RPy/test_99_SieveMoats.py	Tue Oct 03 16:37:04 2023 +0200
+++ b/pytst/writers/RPy/test_99_SieveMoats.py	Tue Oct 03 16:42:37 2023 +0200
@@ -13,9 +13,6 @@
 def test_02_SlowStart(generatedProtocol_verifier):
     generatedProtocol_verifier(aigr_mock=Sieve.SlowStart, td=TstDoubles('protocols/SlowStart'))
 
-
+def test_03_SimpleSieve(generatedProtocol_verifier):
+    generatedProtocol_verifier(aigr_mock=Sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'), save_file=True)
 
[e-mail]("After SlowStart")
-def test_03_SimpleSieve(generatedProtocol_verifier):
-    generatedProtocol_verifier(aigr_mock=Sieve.SimpleSieve, td=TstDoubles('protocols/SimpleSieve'))
-