Skip to content

Commit d204e7c

Browse files
levyZoltanBojthe
levy
authored and
ZoltanBojthe
committed
fix for module tests
1 parent 9a8f6e8 commit d204e7c

8 files changed

Lines changed: 27 additions & 27 deletions

‎tests/module/pingapp_lifecycle_1.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ network Test
5151
%#--------------------------------------------------------------------------------------------------------------
5252
%contains-regex: stdout
5353
.*
54-
\*\* Event #\d+ t=6 Test\.scenarioManager \(ScenarioManager, id=2\)
54+
\*\* Event #\d+ t=6 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=2\)
5555
.*
5656
Test.host starting up
5757
.*
5858
Test.host started
59-
\*\* Event #\d+ t=6 Test\.host\.app\[0\] \(PingApp, id=\d+\)
59+
\*\* Event #\d+ t=6 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6060
Starting up: dest=192\.168\.0\.42 src=<none>seqNo=0
6161
.*Sending ping request #0 to lower layer\.
6262
.*
63-
\*\* Event #\d+ t=7 Test\.host\.app\[0\] \(PingApp, id=\d+\)
63+
\*\* Event #\d+ t=7 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6464
.*
65-
\*\* Event #\d+ t=9 Test\.host\.app\[0\] \(PingApp, id=\d+\)
65+
\*\* Event #\d+ t=9 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6666
.*Sending ping request #3 to lower layer\.
6767
.*
6868

‎tests/module/pingapp_lifecycle_2.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ network Test
5151
%subst: /DEBUG: //
5252
%contains-regex: stdout
5353
.*
54-
\*\* Event #\d+ t=3 Test\.host\.app\[0\] \(PingApp, id=\d+\)
54+
\*\* Event #\d+ t=3 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
5555
Starting up: dest=192\.168\.0\.42 src=<none>seqNo=0
5656
.*Sending ping request #0 to lower layer\.
5757
.*
58-
\*\* Event #\d+ t=4 Test\.host\.app\[0\] \(PingApp, id=\d+\)
58+
\*\* Event #\d+ t=4 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
5959
.*Sending ping request #1 to lower layer\.
6060
.*
61-
\*\* Event #\d+ t=5 Test\.host\.app\[0\] \(PingApp, id=\d+\)
61+
\*\* Event #\d+ t=5 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6262
.*Sending ping request #2 to lower layer\.
6363
.*
64-
\*\* Event #\d+ t=6 Test\.scenarioManager \(ScenarioManager, id=2\)
64+
\*\* Event #\d+ t=6 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=2\)
6565
processing <at> command\.\.\.
6666
processing <shutdown> command\.\.\.
6767
Doing stage 0/8 of operation inet::ModuleStopOperation on Test\.host

‎tests/module/pingapp_lifecycle_3.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ network Test
5252
%#--------------------------------------------------------------------------------------------------------------
5353
%contains-regex: stdout
5454

55-
.*Event #\d+ t=6 .*
55+
.*Event #\d+ .*? t=6 .*
5656
.*
5757
Test.host starting up
5858
.*

‎tests/module/pingapp_lifecycle_4.test‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ network Test
5151
%#--------------------------------------------------------------------------------------------------------------
5252
%subst: /DEBUG: //
5353
%contains-regex: stdout
54-
\*\* Event #\d+ t=0 Test\.host\.app\[0\] \(PingApp, id=\d+\)
54+
\*\* Event #\d+ t=0 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
5555
Starting up: dest=192\.168\.0\.42 src=<none>seqNo=0
5656
.*Sending ping request #0 to lower layer\.
5757
.*
58-
\*\* Event #\d+ t=1 Test\.host\.app\[0\] \(PingApp, id=\d+\)
58+
\*\* Event #\d+ t=1 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
5959
.*
60-
\*\* Event #\d+ t=3 Test\.host\.app\[0\] \(PingApp, id=\d+\)
60+
\*\* Event #\d+ t=3 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6161
.*Sending ping request #3 to lower layer\.
6262
.*
63-
\*\* Event #\d+ t=4 Test\.host\.app\[0\] \(PingApp, id=\d+\)
63+
\*\* Event #\d+ t=4 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6464
.*
65-
\*\* Event #\d+ t=6 Test\.scenarioManager \(ScenarioManager, id=\d+\)
65+
\*\* Event #\d+ t=6 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
6666
processing <at> command\.\.\.
6767
processing <shutdown> command\.\.\.
6868
Doing stage 0/8 of operation inet::ModuleStopOperation on Test\.host

‎tests/module/pingapp_lifecycle_5.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ network Test
5151

5252
%#--------------------------------------------------------------------------------------------------------------
5353
%contains-regex: stdout
54-
\*\* Event #\d+ t=3 Test\.scenarioManager \(ScenarioManager, id=\d+\)
54+
\*\* Event #\d+ t=3 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
5555
processing <at> command\.\.\.
5656
processing <startup> command\.\.\.
5757
Doing stage 0/8 of operation inet::ModuleStartOperation on Test\.host
5858
Test\.host starting up
5959
.*
6060
Test\.host started
61-
\*\* Event #\d+ t=6 Test\.host\.app\[0\] \(PingApp, id=\d+\)
61+
\*\* Event #\d+ t=6 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6262
Starting up: dest=192\.168\.0\.42 src=<none>seqNo=0
6363
.*Sending ping request #0 to lower layer\.
6464
.*
65-
\*\* Event #\d+ t=7 Test\.host\.app\[0\] \(PingApp, id=\d+\)
65+
\*\* Event #\d+ t=7 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6666
.*
67-
.*Event #\d+ t=9 Test\.host\.app\[0\] \(PingApp, id=\d+\)
67+
.*Event #\d+ t=9 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6868
.*Sending ping request #3 to lower layer\.
6969
.*
7070

‎tests/module/pingapp_lifecycle_6.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ network Test
5151

5252
%#--------------------------------------------------------------------------------------------------------------
5353
%contains-regex: stdout
54-
\*\* Event #\d+ t=3 Test\.scenarioManager \(ScenarioManager, id=\d+\)
54+
\*\* Event #\d+ t=3 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
5555
processing <at> command\.\.\.
5656
processing <startup> command\.\.\.
5757
Doing stage 0/8 of operation inet::ModuleStartOperation on Test\.host
5858
Test\.host starting up
5959
.*
6060
Test\.host started
61-
\*\* Event #\d+ t=3 Test\.host\.app\[0\] \(PingApp, id=\d+\)
61+
\*\* Event #\d+ t=3 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6262
Starting up: dest=192\.168\.0\.42 src=<none>seqNo=0
6363
.*Sending ping request #0 to lower layer\.
6464
.*
65-
\*\* Event #\d+ t=4 Test\.host\.app\[0\] \(PingApp, id=\d+\)
65+
\*\* Event #\d+ t=4 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6666
.*
67-
\*\* Event #\d+ t=6 Test\.host\.app\[0\] \(PingApp, id=\d+\)
67+
\*\* Event #\d+ t=6 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6868
.*Sending ping request #3 to lower layer\.
6969
.*
7070

‎tests/module/pingapp_lifecycle_7.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ network Test
5252
%#--------------------------------------------------------------------------------------------------------------
5353
%contains: stdout
5454
Running simulation...
55-
** Event #1 t=3 Test.scenarioManager (ScenarioManager, id=2)
55+
** Event #1 t=3 on scenario-event (inet::ScenarioTimer) in Test.scenarioManager (ScenarioManager, id=2)
5656
processing <at> command...
5757
processing <shutdown> command...
5858
Doing stage 0/8 of operation inet::ModuleStopOperation on Test.host

‎tests/module/pingapp_lifecycle_8.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ network Test
5050

5151
%#--------------------------------------------------------------------------------------------------------------
5252
%contains-regex: stdout
53-
\*\* Event #\d+ t=0 Test\.host\.app\[0\] \(PingApp, id=\d+\)
53+
\*\* Event #\d+ t=0 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
5454
Starting up: dest=192\.168\.0\.42 src=<none>seqNo=0
5555
.*Sending ping request #0 to lower layer\.
5656
.*
57-
\*\* Event #\d+ t=1 Test\.host\.app\[0\] \(PingApp, id=\d+\)
57+
\*\* Event #\d+ t=1 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
5858
.*Sending ping request #1 to lower layer\.
5959
.*
60-
\*\* Event #\d+ t=2 Test\.host\.app\[0\] \(PingApp, id=\d+\)
60+
\*\* Event #\d+ t=2 on sendPing \(omnetpp::cMessage\) in Test\.host\.app\[0\] \(PingApp, id=\d+\)
6161
.*Sending ping request #2 to lower layer\.
6262
.*
63-
\*\* Event #\d+ t=3 Test\.scenarioManager \(ScenarioManager, id=\d+\)
63+
\*\* Event #\d+ t=3 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
6464
processing <at> command\.\.\.
6565
processing <shutdown> command\.\.\.
6666
Doing stage 0/8 of operation inet::ModuleStopOperation on Test\.host

0 commit comments

Comments
 (0)