提交: b42f9200ebf94cdb3fb73e1007e1942411261ded - CCastle2 (hg)

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

Commit MetaInfo

• 修订版: b42f9200ebf94cdb3fb73e1007e1942411261ded (tree)
• 时间: 2024-05-27 01:44:26
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

BUSY: TESTDOUBLES::sieveCastle::EV, test & then are dummy

更改概述

• modified: TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/basic1/sieveCastle.py
• modified: TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/test_sieveCastle.py

差异

diff -r c4c7ce3a80cd -r b42f9200ebf9 TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/basic1/sieveCastle.py
--- a/TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/basic1/sieveCastle.py	Sun May 26 18:24:36 2024 +0200
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/castle/TESTDOUBLES/aigr/sieve/basic1/sieveCastle.py	Sun May 26 18:44:26 2024 +0200
@@ -65,8 +65,14 @@
                                event=ID('input', context=aigr.Ref()),
                                port=ID('try', context=aigr.Ref()),
                                body=aigr.Body(statements=[
-                                   # XXXX
-                               ])) 
+                                   aigr.If(
+                                      test=aigr.Compare(ops=aigr.operators.NotEqual(), values=(
+                                          "try % .myPrime",
+                                          "0"
+                                          )),
+                                      body=aigr.Body(statements=[
+                                          "XXX"
+                                          ]))]))
 
 
 

diff -r c4c7ce3a80cd -r b42f9200ebf9 TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/test_sieveCastle.py
--- a/TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/test_sieveCastle.py	Sun May 26 18:24:36 2024 +0200
+++ b/TestDoubles_packages/TestDoubles-aigr-sieve/pytst/sieve/basic1/test_sieveCastle.py	Sun May 26 18:44:26 2024 +0200
@@ -3,10 +3,8 @@
    See: http://docideas.mietus.nl/en/default/CCastle/4.Blog/b.TheSieve.html#the-design
 """
 import logging; logger = logging.getLogger(__name__)
-
 import pytest
 
-
 from castle import aigr
 from castle.aigr_extra.blend import mangle_event_handler
 
@@ -21,6 +19,17 @@
 def comp():
     return sieveCastle.Sieve
 
[e-mail]
+def event_handler(comp):
+      # Notes
+      ##  - event(`input`) -- this protocol has only one event, so its simple
+      ##  - port('try')    -- thats the 1ste one. But keep it in sync (CastleCode is leading)
+    (protocol, event, port)  = protocols.SimpleSieve, protocols.SimpleSieve.events[0], components.SieveMoat.ports[0]
+    handler = find_name_in_body(mangle_event_handler(protocol=protocol.name,  event=event.name,  port=port.name), comp.body)
+    assert isinstance(handler, aigr.EventHandler), f"Expected EventHandler, got {handler} (type={type(handler)})" # Not a test, only to check.
+    logger.debug("Found <%s> as event_handler", handler)
+    return handler
+
 
 def test_0a_types(comp):
     assert isinstance(comp, aigr.ComponentImplementation)
@@ -35,7 +44,6 @@
 def test_0c_noParms(comp):
     assert comp.parameters == ()
 
-
 def test_1_init_has_2lines(comp):
     init = find_name_in_body('init', comp.body)
     assert isinstance(init, aigr.Method), f"Expected an init method, got {init}"
@@ -48,19 +56,45 @@
     assert isinstance(id.context, aigr.Ref), f"found ID '{id}' has not ref"
     # XXX ToDo: check the ref -- for now empty is fine
 
+def test_2_handler_on_try(event_handler):
+    verify_IDref(event_handler.protocol, "SimpleSieve")
+    verify_IDref(event_handler.event,    "input")
+    verify_IDref(event_handler.port,     "try")
 
-def test_2_handler_on_try(comp):
-    """The event-handler name and the name of protocol/event/port are all text, but ...
-       should match the names of the earlier/elsewere defined protocol/event/port structure.
-       """
-      # Notes
-      #@  - event(`input`) -- this protocol has only one event, so its simple
-      ##  - port('try')    -- thats the 1ste one. But keep it in sync (CastleCode is leading)
-    (protocol, event, port)  = protocols.SimpleSieve, protocols.SimpleSieve.events[0], components.SieveMoat.ports[0]
 
-    handler = find_name_in_body(mangle_event_handler(protocol=protocol.name,  event=event.name,  port=port.name), comp.body)
-    assert handler, "No handler found"
+def test_3a_EH_is_one_statement(event_handler):
+    "This eventhandler has basically one (multiline) statement: an if an 1 statement inside"
+    body = event_handler.body
+    assert isinstance(body, aigr.Body), f"any EH Should have a Body (instance), but found {body} (type={type(body)})"
+    assert len(body)==1, f"Expected a single (long) statement, but found {len(body)} statement(s)"
 
-    verify_IDref(handler.protocol, protocol.name)
-    verify_IDref(handler.event,    event.name)
-    verify_IDref(handler.port,     port.name)
+
+def test_3b_EH_is_one_if(event_handler):
+    if_statement=event_handler.body[0]
+    assert isinstance(if_statement, aigr.If) # Not a test, only to check.
+
+    test = if_statement.test
+    then = if_statement.body
+    orelse = if_statement.orelse
+    logger.debug("if_statement: test=%s, then=%s, orelse=%s", test,then,orelse)
+
+    assert isinstance(test, aigr.expressions._expression) # The expressions itself is below
+    assert isinstance(then, aigr.Body) and len(then)==1   # The statement is tested below
+    assert orelse is None
+
+
+def test_3c_EH_test_exps(event_handler):
+    if_statement = event_handler.body[0]
+    test = if_statement.test
+
+    assert False, "ToDo if-expr"
+
+
+def test_3d_EH_then_send(event_handler):
+    if_statement=event_handler.body[0]
+    then = if_statement.body
+    assert len(then) == 1 # Not a test, only to check.
+    send = then[0]
+
+    assert False, "ToDo if-then"
+