Commit: b2432bdd5231ad6a709d3dd967f7161ba52df9cd - CCastle2 (hg)

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

Commit MetaInfo

• Revision: b2432bdd5231ad6a709d3dd967f7161ba52df9cd (tree)
• Zeit: 2023-09-26 23:20:00
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

MockEvent & MockProtocol are gone from the tests now

Ändern Zusammenfassung

• modified: Makefile
• modified: pytst/writers/RPy/__init__.py
• modified: pytst/writers/RPy/test_1_EventIndexes.py
• modified: pytst/writers/RPy/test_2_ProtocolDataStructures.py
• modified: pytst/writers/RPy/test_99_StartSieve.py

Diff

diff -r cc731cbbbeab -r b2432bdd5231 Makefile
--- a/Makefile	Tue Sep 26 16:18:23 2023 +0200
+++ b/Makefile	Tue Sep 26 16:20:00 2023 +0200
@@ -8,16 +8,17 @@
 # CURRENT:	The now current test, in TDD phase
 # TODO:		Some test that are needed soon
 rPY_LAST = \
-	pytst/writers/RPy/test_0_templating.py			\
 	pytst/aigr/test_0_AIGR.py				\
 	pytst/aigr/test_1_events.py				\
 	pytst/aigr/test_2a_protocolKind.py			\
 	pytst/aigr/test_2b_protocol.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	\
 #
 rPY_CURRENT = \
-	pytst/aigr/test_2b_protocol.py				\
-	pytst/writers/RPy/test_2_ProtocolDataStructures.py	\
+	pytst/writers/RPy/test_1_EventIndexes.py		\
 #
 CC2CPy_TODO = \
 	pytst/writers/RPy/test_99_StartSieve.py			\

diff -r cc731cbbbeab -r b2432bdd5231 pytst/writers/RPy/__init__.py
--- a/pytst/writers/RPy/__init__.py	Tue Sep 26 16:18:23 2023 +0200
+++ b/pytst/writers/RPy/__init__.py	Tue Sep 26 16:20:00 2023 +0200
@@ -10,13 +10,6 @@
 from castle.aigr import Event, Protocol
 from castle.writers import RPy
 
-@dataclass
-class MockEvent(Event):
-    indexNo: int
-
-@dataclass
-class MockProtocol():
-    name: str
 
 @pytest.fixture
 def T_Protocol():
@@ -32,10 +25,13 @@
 
 
 
-def assert_marker(marker, txt, need, msg=None):
+def assert_marker(marker, txt, need=None, msg=None):
     lines = txt.splitlines()
     c = sum(1 if (marker in line) else 0 for line in lines)
-    assert c == need, f"Needed {need} lines with '{marker}'-markers, found {c} -- in {len(lines)} lines" + ((+ ' ' + msg) if msg else "")
+    if need is None:
+        assert c > 0, f"Expected lines with '{marker}'-marker, found nothing in:\n----\n{txt}\n----"
+    else:
+        assert c == need, f"Needed {need} lines with '{marker}'-markers, found {c} -- in {len(lines)} lines" + ((+ ' ' + msg) if msg else "")
 
 
 def get_dirPath_of_file(f=__file__):

diff -r cc731cbbbeab -r b2432bdd5231 pytst/writers/RPy/test_1_EventIndexes.py
--- a/pytst/writers/RPy/test_1_EventIndexes.py	Tue Sep 26 16:18:23 2023 +0200
+++ b/pytst/writers/RPy/test_1_EventIndexes.py	Tue Sep 26 16:20:00 2023 +0200
@@ -5,9 +5,8 @@
 
 from castle.aigr.types import TypedParameter
 
-from castle.aigr import EventProtocol
+from castle.aigr import EventProtocol, Event
 from . import T_EventIndexes
-from . import MockEvent
 from . import T_Protocol
 from . import assert_marker
 
@@ -15,10 +14,6 @@
 EventIndex_PreFix = "CC_P_"               #Keep in sync with implementation
 
 
[e-mail]("XXX ToDo:: The MockEvent should go")
-def test_ToDo(): pass
-
-
 def test_template_0_NoEvent(T_EventIndexes):
     p = EventProtocol("NoEventsMOCK", events=[])
     out=T_EventIndexes.render(protocol=p, events=p.events)
@@ -29,29 +24,29 @@
 
 
 def test_template_1_event(T_EventIndexes):
-    p = EventProtocol("MOCK", events=[MockEvent("input", indexNo=-7, typedParameters=[TypedParameter(name='event', type=int)])])
+    p = EventProtocol("MOCK", events=[Event("input", typedParameters=[TypedParameter(name='event', type=int)])])
     out=T_EventIndexes.render(protocol=p, events=p.events)
     logger.debug("out::\n%s", out)
 
     assert_marker(EventIndex_PreFix, out, 1)
-    assert_marker('=', out, 1)
+    assert_marker('= 0', out)
 
 
 def test_template_2_SomeEvent(T_EventIndexes):
-    p = EventProtocol("MOCK", events=\
-                          [ MockEvent("one",  indexNo=1),
-                            MockEvent("two",  indexNo=2),
-                            MockEvent("three",indexNo=3),
-                            MockEvent("four", indexNo=4)])
+    p = EventProtocol("MOCK", events= [Event("one"), Event("two"), Event("three"), Event("four")])
     out=T_EventIndexes.render(protocol=p, events=p.events)
     logger.debug("out::\n%s", out)
 
     assert_marker(EventIndex_PreFix, out, 4)
-    assert_marker('=', out, 4)
+    assert_marker('= 0', out)
+    assert_marker('= 1', out)
+    assert_marker('= 2', out)
+    assert_marker('= 3', out)
+
 
 
 def test_EventIndexes_In_protocol(T_Protocol):
-    out=T_Protocol.render(protocols=[EventProtocol(name="MOCK", events=[MockEvent("input", indexNo=-7)])])
+    out=T_Protocol.render(protocols=[EventProtocol(name="MOCK", events=[Event("input")])])
     logger.info("\n---------- out:: ------------------------\n%s\n--------------------------------", out)
     assert True, "No assert (not maintainable) only check it runs"
 

diff -r cc731cbbbeab -r b2432bdd5231 pytst/writers/RPy/test_2_ProtocolDataStructures.py
--- a/pytst/writers/RPy/test_2_ProtocolDataStructures.py	Tue Sep 26 16:18:23 2023 +0200
+++ b/pytst/writers/RPy/test_2_ProtocolDataStructures.py	Tue Sep 26 16:20:00 2023 +0200
@@ -3,11 +3,10 @@
 import logging; logger = logging.getLogger(__name__)
 import pytest
 
-from castle.aigr import Event, EventProtocol
+from castle.aigr import EventProtocol, Event
 from castle.aigr.types import TypedParameter
 
 from . import T_ProtocolDataStructures
-from . import MockEvent
 from . import T_Protocol
 from . import assert_marker
 
@@ -19,14 +18,14 @@
 @pytest.fixture
 def p_1e():
     "Protocol with 1 event"
-    p = EventProtocol(name="P1", events=(MockEvent(name="e1", indexNo=101),))
+    p = EventProtocol(name="P1", events=(Event(name="e1"),))
     logger.debug("%s", p)
     return p
 
 @pytest.fixture
 def p_2e_1i(p_1e):
     "Protocol with 2 events, and 1 inherited; so 3 in total"
-    p = EventProtocol(name="P2", events=(MockEvent(name="e2", indexNo=102), MockEvent(name="e3", indexNo=103)), based_on=p_1e)
+    p = EventProtocol(name="P2", events=(Event(name="e2"), Event(name="e3")), based_on=p_1e)
     logger.debug("%s", p)
     return p
 

diff -r cc731cbbbeab -r b2432bdd5231 pytst/writers/RPy/test_99_StartSieve.py
--- a/pytst/writers/RPy/test_99_StartSieve.py	Tue Sep 26 16:18:23 2023 +0200
+++ b/pytst/writers/RPy/test_99_StartSieve.py	Tue Sep 26 16:20:00 2023 +0200
@@ -1,20 +1,15 @@
 # (C) Albert Mietus, 2023. Part of Castle/CCastle project
 
 import logging; logger = logging.getLogger(__name__)
+
 import pytest
 
-from castle.aigr.types import TypedParameter
+from pytst.TestDoubles.protocols import StartSieve   #XXX
 
 from . import T_Protocol
-from . import MockEvent, MockProtocol
 
 @pytest.mark.xfail
 def test_99_StartSieve(T_Protocol):
-    out = T_Protocol.render(
-        protocol=MockProtocol("StartSieve"),
-        events=[
-            MockEvent("runTo",  indexNo=7, typedParameters=[TypedParameter(name='max', type=int)]),
-            MockEvent("newMax", indexNo=8, typedParameters=[TypedParameter(name='max', type=int)]),
-            ])
+    out = T_Protocol.render(protocols=[StartSieve,])
     logger.info("\n---------- out:: ------------------------\n%s\n--------------------------------", out)
     assert False