benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Activity-Lang: demonstrate multi-stage Gate

Browse source 
...seems to work, but not really happy with the test setup,
since in real usage the post()-calls would dispatch, while here,
using the ActivityDetector, these calls just log invoation,
and thus the activation is not passed on
This commit is contained in:
Fischlurch 2023-09-01 19:23:27 +02:00
parent 44e840f27c
commit fd8716d398
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/vault/gear/activity-detector.hpp
View file

@ -134,7 +134,7 @@ namespace test {
const string CTX_TICK{"CTX-tick"};
Offset POLL_DELAY{FSecs(1)};
Time SCHED_TIME_MARKER{777,7}; ///< marker value for "current scheduler time" used in tests
Time SCHED_TIME_MARKER{555,5}; ///< marker value for "current scheduler time" used in tests
}
class ActivityDetector;

25
tests/vault/gear/scheduler-activity-test.cpp
View file

@ -502,7 +502,7 @@ namespace test {
* - Case-1 : a Notification decreases the latch, but blocks otherwise
* - Case-2 : when the primary chain is activated after the Notification,
* then the tail chain behind the Gate is dispatched
* @todo WIP 8/23 🔁 define ⟶ implement
* @todo WIP 8/23 🔁 define ✔ implement
*/
void
scenario_Notification()
@ -511,10 +511,8 @@ namespace test {
Time start{0,1};
Time dead{0,10};
Time now{555,5};
ActivityDetector detector;
detector.executionCtx.getSchedTime = [&]{ return now; };
Job testJob{detector.buildMockJob("testJob", nominal, 12345)};
BlockFlowAlloc bFlow;
@ -533,14 +531,23 @@ namespace test {
// additionally insert inhibition prior to primary-chain activation
term.requireDirectActivation();
CHECK (activity::PASS == ActivityLang::dispatchChain (anchor, detector.executionCtx));
detector.insertActivationTap(trigger.data_.notification.target, "trigger");
CHECK (activity::PASS == ActivityLang::dispatchChain (trigger, detector.executionCtx));
CHECK (detector.verifyInvocation("trigger") .seq(0).arg("5.555 --notify-↯> Act(GATE"));
detector.incrementSeq();
CHECK (activity::PASS == ActivityLang::dispatchChain (anchor, detector.executionCtx));
CHECK (detector.verifyInvocation("CTX-post").seq(1).arg("5.555","Act(NOTIFY","≺test::CTX≻")
.beforeInvocation("theGate") .seq(1).arg("5.555 ⧐ Act(GATE")
.beforeInvocation("CTX-post").seq(1).arg("6.555","Act(GATE","≺test::CTX≻"));
detector.incrementSeq();
CHECK (activity::PASS == ActivityLang::dispatchChain (trigger, detector.executionCtx));
CHECK (detector.verifyInvocation("trigger") .seq(2).arg("5.555 --notify-↯> Act(GATE")
.beforeInvocation("CTX-post").seq(2).arg("5.555","after-theGate","≺test::CTX≻"));
cout << detector.showLog()<<endl;
CHECK (detector.verifyInvocation("theGate").arg("5.555 ⧐ Act(GATE")
.beforeInvocation("after-theGate").arg("⧐ Act(WORKSTART")
.beforeInvocation("CTX-work").arg("5.555","")
.beforeInvocation("testJob") .arg("7.007",12345)
.beforeInvocation("CTX-done").arg("5.555",""));
}