diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-12-01 11:02:40 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-12-01 11:02:40 (GMT) |
| commit | af6609592298c5e047e37e5ae2b47e6a8edbb677 (patch) | |
| tree | e6e7da1cd34dccf3fb4f389e684b7c899b12987a /test/w3c/promela | |
| parent | d2e90c02e5ad19a5857e7c7fb87f248182fdb32d (diff) | |
| download | uscxml-af6609592298c5e047e37e5ae2b47e6a8edbb677.zip uscxml-af6609592298c5e047e37e5ae2b47e6a8edbb677.tar.gz uscxml-af6609592298c5e047e37e5ae2b47e6a8edbb677.tar.bz2 | |
Nested invokers and delayed events for PROMELA model checking
Diffstat (limited to 'test/w3c/promela')
73 files changed, 173 insertions, 180 deletions
diff --git a/test/w3c/promela/test175.scxml b/test/w3c/promela/test175.scxml index 9cd732f..c44a6ab 100644 --- a/test/w3c/promela/test175.scxml +++ b/test/w3c/promela/test175.scxml @@ -4,13 +4,13 @@ event1 will be raised first. Succeed if event1 occurs before event2, otherwise fail --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <datamodel> - <data id="Var1" type="string" expr="'0s'"/> + <data id="Var1" type="int" expr="0"/> </datamodel> <state id="s0"> <onentry> - <assign location="Var1" expr="'1s'"/> + <assign location="Var1" expr="1000"/> <send delayexpr="Var1" event="event2"/> - <send delayexpr="'.5s'" event="event1"/> + <send delayexpr="500" event="event1"/> </onentry> <transition event="event1" target="s1"/> <transition event="event2" target="fail"/> diff --git a/test/w3c/promela/test185.scxml b/test/w3c/promela/test185.scxml index 8cb877c..0ef8c2e 100644 --- a/test/w3c/promela/test185.scxml +++ b/test/w3c/promela/test185.scxml @@ -4,7 +4,7 @@ <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="event2" delayexpr="'1s'"/> + <send event="event2" delayexpr="1000"/> <send event="event1"/> </onentry> <transition event="event1" target="s1"/> diff --git a/test/w3c/promela/test186.scxml b/test/w3c/promela/test186.scxml index d8c30ea..b30f6d0 100644 --- a/test/w3c/promela/test186.scxml +++ b/test/w3c/promela/test186.scxml @@ -9,7 +9,7 @@ in the interval.) If var2 ends up == 1, we pass. Otherwise we fail --> </datamodel> <state id="s0"> <onentry> - <send event="event1" delayexpr="'1s'"> + <send event="event1" delayexpr="1000"> <param name="aParam" expr="Var1"/> </send> <assign location="Var1" expr="2"/> diff --git a/test/w3c/promela/test187.scxml b/test/w3c/promela/test187.scxml index 1400694..fe09a12 100644 --- a/test/w3c/promela/test187.scxml +++ b/test/w3c/promela/test187.scxml @@ -6,7 +6,7 @@ parent session, should not receive childToParent. If it does, we fail. Otherwis <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout" delayexpr="'1s'"/> + <send event="timeout" delayexpr="1000"/> </onentry> <invoke type="scxml"> <content> @@ -14,7 +14,7 @@ parent session, should not receive childToParent. If it does, we fail. Otherwis <scxml initial="sub0" version="1.0" datamodel="promela"> <state id="sub0"> <onentry> - <send event="childToParent" target="#_parent" delayexpr="'.5s'"/> + <send event="childToParent" target="#_parent" delayexpr="500"/> </onentry> <transition target="subFinal"/> </state> diff --git a/test/w3c/promela/test191.scxml b/test/w3c/promela/test191.scxml index 760caf9..6fc9a7f 100644 --- a/test/w3c/promela/test191.scxml +++ b/test/w3c/promela/test191.scxml @@ -5,7 +5,7 @@ pass, otherwise we fail. The timer insures that some event is generated and tha <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout" delay="5s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> </onentry> <invoke type="scxml"> <content> diff --git a/test/w3c/promela/test192.scxml b/test/w3c/promela/test192.scxml index 0a50aed..48a019a 100644 --- a/test/w3c/promela/test192.scxml +++ b/test/w3c/promela/test192.scxml @@ -7,7 +7,7 @@ We also set a timeout in this process to make sure the test doesn't hang --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="5s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> </onentry> <invoke type="scxml" id="invokedChild"> <content> @@ -17,7 +17,7 @@ We also set a timeout in this process to make sure the test doesn't hang --> <state id="sub0"> <onentry> <send event="childToParent" target="#_parent"/> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> </onentry> <transition event="parentToChild" target="subFinal"> <send target="#_parent" event="eventReceived"/> diff --git a/test/w3c/promela/test193.scxml b/test/w3c/promela/test193.scxml index aa2f297..2d240e7 100644 --- a/test/w3c/promela/test193.scxml +++ b/test/w3c/promela/test193.scxml @@ -7,7 +7,7 @@ SCXML event i/o processor puts the event on the external queue. --> <send event="internal"/> <!-- this should put event1 in the external queue --> <send event="event1" type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor"/> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="event1" target="fail"/> <transition event="internal" target="s1"/> diff --git a/test/w3c/promela/test207.scxml b/test/w3c/promela/test207.scxml index 4adbfca..a780b41 100644 --- a/test/w3c/promela/test207.scxml +++ b/test/w3c/promela/test207.scxml @@ -6,7 +6,7 @@ raised in another session, but the spec doesn't define any way to refer to an ev <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delayexpr="'2s'"/> + <send event="timeout" delayexpr="2000"/> </onentry> <invoke type="scxml"> <content> @@ -16,8 +16,8 @@ raised in another session, but the spec doesn't define any way to refer to an ev <scxml initial="sub0" version="1.0" datamodel="promela"> <state id="sub0"> <onentry> - <send event="event1" id="foo" delayexpr="'1s'"/> - <send event="event2" delayexpr="'1.5s'"/> + <send event="event1" id="foo" delayexpr="1000"/> + <send event="event2" delayexpr="1500"/> <send target="#_parent" event="childToParent"/> </onentry> <transition event="event1" target="subFinal"> diff --git a/test/w3c/promela/test208.scxml b/test/w3c/promela/test208.scxml index 72f57a6..3fce2d2 100644 --- a/test/w3c/promela/test208.scxml +++ b/test/w3c/promela/test208.scxml @@ -4,8 +4,8 @@ we get event1 or an error first, cancel didn't work and we fail. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send id="foo" event="event1" delayexpr="'1s'"/> - <send event="event2" delayexpr="'1.5s'"/> + <send id="foo" event="event1" delayexpr="1000"/> + <send event="event2" delayexpr="1500"/> <cancel sendid="foo"/> </onentry> <transition event="event2" target="pass"/> diff --git a/test/w3c/promela/test210.scxml b/test/w3c/promela/test210.scxml index 6b692be..08612be 100644 --- a/test/w3c/promela/test210.scxml +++ b/test/w3c/promela/test210.scxml @@ -7,8 +7,8 @@ delayed event1. Thus we get event2 first and pass. If we get event1 or an erro </datamodel> <state id="s0"> <onentry> - <send id="foo" event="event1" delayexpr="'1s'"/> - <send event="event2" delayexpr="'1.5s'"/> + <send id="foo" event="event1" delayexpr="1000"/> + <send event="event2" delayexpr="1500"/> <assign location="Var1" expr="'foo'"/> <cancel sendidexpr="Var1"/> </onentry> diff --git a/test/w3c/promela/test215.scxml b/test/w3c/promela/test215.scxml index 1a0819b..3f139c5 100644 --- a/test/w3c/promela/test215.scxml +++ b/test/w3c/promela/test215.scxml @@ -8,7 +8,7 @@ the runtime value is used, the invocation will succeed --> </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="5s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> <assign location="Var1" expr="'http://www.w3.org/TR/scxml/'"/> </onentry> <invoke typeexpr="Var1"> diff --git a/test/w3c/promela/test216.scxml b/test/w3c/promela/test216.scxml index 6a9aaa4..8555040 100644 --- a/test/w3c/promela/test216.scxml +++ b/test/w3c/promela/test216.scxml @@ -8,7 +8,7 @@ the runtime value is used, the invocation will succeed --> </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="5s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> <assign location="Var1" expr="'file:test216sub1.scxml'"/> </onentry> <invoke srcexpr="Var1" type="http://www.w3.org/TR/scxml"/> diff --git a/test/w3c/promela/test220.scxml b/test/w3c/promela/test220.scxml index 25bb26b..e16f838 100644 --- a/test/w3c/promela/test220.scxml +++ b/test/w3c/promela/test220.scxml @@ -3,7 +3,7 @@ <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout" delay="5s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/promela/test223.scxml b/test/w3c/promela/test223.scxml index 5317ac7..99ee320 100644 --- a/test/w3c/promela/test223.scxml +++ b/test/w3c/promela/test223.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" idlocation="Var1"> <content> diff --git a/test/w3c/promela/test224.scxml b/test/w3c/promela/test224.scxml index 3892083..09bbb25 100644 --- a/test/w3c/promela/test224.scxml +++ b/test/w3c/promela/test224.scxml @@ -7,7 +7,7 @@ </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" idlocation="Var1"> <content> diff --git a/test/w3c/promela/test225.scxml b/test/w3c/promela/test225.scxml index 25aa2f1..b38d1a2 100644 --- a/test/w3c/promela/test225.scxml +++ b/test/w3c/promela/test225.scxml @@ -7,7 +7,7 @@ </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" idlocation="Var1"> <content> diff --git a/test/w3c/promela/test226.scxml b/test/w3c/promela/test226.scxml index 7ab32d8..9a003c2 100644 --- a/test/w3c/promela/test226.scxml +++ b/test/w3c/promela/test226.scxml @@ -5,7 +5,7 @@ success. otherwise it will hang and the timeout in this doc signifies failure. <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" src="file:test226sub1.scxml"> <param name="Var1" expr="1"/> diff --git a/test/w3c/promela/test228.scxml b/test/w3c/promela/test228.scxml index 9771a9e..137418a 100644 --- a/test/w3c/promela/test228.scxml +++ b/test/w3c/promela/test228.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" id="foo"> <content> diff --git a/test/w3c/promela/test229.scxml b/test/w3c/promela/test229.scxml index 3ba733a..4030b85 100644 --- a/test/w3c/promela/test229.scxml +++ b/test/w3c/promela/test229.scxml @@ -6,7 +6,7 @@ it eventually times out and the done.invoke signals failure --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" autoforward="true"> <content> @@ -18,7 +18,7 @@ it eventually times out and the done.invoke signals failure --> <state id="sub0"> <onentry> <send target="#_parent" event="childToParent"/> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> </onentry> <transition event="childToParent" target="subFinal"> <send target="#_parent" event="eventReceived"/> diff --git a/test/w3c/promela/test230.scxml b/test/w3c/promela/test230.scxml index ee97cef..e8bd447 100644 --- a/test/w3c/promela/test230.scxml +++ b/test/w3c/promela/test230.scxml @@ -6,7 +6,7 @@ must check if they are the same and report his result. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" autoforward="true"> <content> @@ -16,7 +16,7 @@ must check if they are the same and report his result. --> <state id="sub0"> <onentry> <send target="#_parent" event="childToParent"/> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <transition event="childToParent" target="subFinal"> <log label="name is " expr="_event.name"/> diff --git a/test/w3c/promela/test232.scxml b/test/w3c/promela/test232.scxml index 2c8a8aa..c54874e 100644 --- a/test/w3c/promela/test232.scxml +++ b/test/w3c/promela/test232.scxml @@ -3,7 +3,7 @@ <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/promela/test233.scxml b/test/w3c/promela/test233.scxml index 3087e1f..195d244 100644 --- a/test/w3c/promela/test233.scxml +++ b/test/w3c/promela/test233.scxml @@ -8,7 +8,7 @@ the transtitions. --> </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/promela/test234.scxml b/test/w3c/promela/test234.scxml index ee59cad..2e79a98 100644 --- a/test/w3c/promela/test234.scxml +++ b/test/w3c/promela/test234.scxml @@ -10,7 +10,7 @@ var2 should still be set to 1 --> </datamodel> <parallel id="p0"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="p01"> @@ -39,7 +39,7 @@ var2 should still be set to 1 --> <scxml version="1.0" initial="sub0" datamodel="promela"> <state id="sub0"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <transition event="timeout" target="subFinal2"/> </state> diff --git a/test/w3c/promela/test235.scxml b/test/w3c/promela/test235.scxml index 95b5827..6c6383b 100644 --- a/test/w3c/promela/test235.scxml +++ b/test/w3c/promela/test235.scxml @@ -4,7 +4,7 @@ and should generate done.invoke.foo --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" id="foo"> <content> diff --git a/test/w3c/promela/test236.scxml b/test/w3c/promela/test236.scxml index 600b7f4..2a8c76c 100644 --- a/test/w3c/promela/test236.scxml +++ b/test/w3c/promela/test236.scxml @@ -5,7 +5,7 @@ events after the done.invoke. Hence timeout indicates success --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout" delayexpr="'2s'"/> + <send event="timeout" delayexpr="2000"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/promela/test237.scxml b/test/w3c/promela/test237.scxml index d23fc20..b39e7db 100644 --- a/test/w3c/promela/test237.scxml +++ b/test/w3c/promela/test237.scxml @@ -6,7 +6,7 @@ the time timeout2 fires, success --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout1" delayexpr="'1s'"/> + <send event="timeout1" delayexpr="1000"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> @@ -14,7 +14,7 @@ the time timeout2 fires, success --> <scxml initial="sub0" version="1.0" datamodel="promela"> <state id="sub0"> <onentry> - <send event="timeout" delayexpr="'2s'"/> + <send event="timeout" delayexpr="2000"/> </onentry> <transition event="timeout" target="subFinal"/> </state> @@ -26,7 +26,7 @@ the time timeout2 fires, success --> </state> <state id="s1"> <onentry> - <send event="timeout2" delayexpr="'1.5s'"/> + <send event="timeout2" delayexpr="1500"/> </onentry> <!-- here we should NOT get done.invoke --> <transition event="done.invoke" target="fail"/> diff --git a/test/w3c/promela/test239.scxml b/test/w3c/promela/test239.scxml index dab80b9..dc13d5f 100644 --- a/test/w3c/promela/test239.scxml +++ b/test/w3c/promela/test239.scxml @@ -3,7 +3,7 @@ <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/promela/test240.scxml b/test/w3c/promela/test240.scxml index e586d4e..f18b796 100644 --- a/test/w3c/promela/test240.scxml +++ b/test/w3c/promela/test240.scxml @@ -9,7 +9,7 @@ should run correctly. --> </datamodel> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> @@ -46,7 +46,7 @@ should run correctly. --> <transition cond="Var1==1" target="subFinal2"> <send target="#_parent" event="success"/> </transition> - <transition target="subFinal1"> + <transition target="subFinal2"> <send target="#_parent" event="failure"/> </transition> </state> diff --git a/test/w3c/promela/test241.scxml b/test/w3c/promela/test241.scxml index dff2920..f2cebaa 100644 --- a/test/w3c/promela/test241.scxml +++ b/test/w3c/promela/test241.scxml @@ -9,7 +9,7 @@ Var1, but should run correctly. --> </datamodel> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/promela/test242.scxml b/test/w3c/promela/test242.scxml index 01ea8d0..c887bcf 100644 --- a/test/w3c/promela/test242.scxml +++ b/test/w3c/promela/test242.scxml @@ -1,56 +1,53 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- test that markup specified by 'src' and by <content> is treated the same way. That means that -either we get done.invoke in both cases or in neither case (in which case we timeout) --> -<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> - <state id="s0"> - <onentry> - <send event="timeout1" delay="1s"/> +<?xml version="1.0" encoding="UTF-8"?><!-- test that markup specified by 'src' and by <content> is treated the same way. That means that +either we get done.invoke in both cases or in neither case (in which case we timeout) --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> + + +<state id="s0"> + <onentry> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> - <invoke type="http://www.w3.org/TR/scxml/" src="file:test242sub1.scxml"/> - <transition event="done.invoke" target="s02"/> - <transition event="timeout1" target="s03"/> - </state> - <state id="s02"> - <onentry> - <send event="timeout2" delay="1s"/> - </onentry> - <invoke type="http://www.w3.org/TR/scxml/"> - <!-- identical to test242sub1.scxml. --> - <content> - <scxml version="1.0" initial="subFinal1" datamodel="promela"> - <final id="subFinal1"/> - </scxml> - </content> - </invoke> - <!-- we got done.invoke last time, so we need it this time too --> - <transition event="done.invoke" target="pass"/> - <transition event="timeout2" target="fail"/> - </state> - <state id="s03"> - <onentry> - <send event="timeout3" delay="1s"/> - </onentry> - <invoke type="http://www.w3.org/TR/scxml/"> - <!-- identical to test242sub1.scxml. --> - <content> - <scxml version="1.0" initial="subFinal2" datamodel="promela"> - <final id="subFinal2"/> - </scxml> - </content> - </invoke> - <!-- we got timeout last time, so we need it this time too --> - <transition event="timeout3" target="pass"/> - <transition event="done.invoke" target="fail"/> - </state> - <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="pass"> + + <invoke type="http://www.w3.org/TR/scxml/" src="file:test242sub1.scxml"/> + <transition event="done.invoke" target="s02"/> + <transition event="timeout1" target="s03"/> + </state> + +<state id="s02"> <onentry> - <log label="Outcome" expr="'pass'"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> - </final> - <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="fail"> + <invoke type="http://www.w3.org/TR/scxml/"> + <!-- identical to test242sub1.scxml. --> + <content> + <scxml version="1.0" initial="subFinal1" datamodel="promela"> + <final id="subFinal1"/> + </scxml> + </content> + </invoke> + <!-- we got done.invoke last time, so we need it this time too --> + <transition event="done.invoke" target="pass"/> + <transition event="timeout2" target="fail"/> + </state> + +<state id="s03"> <onentry> - <log label="Outcome" expr="'fail'"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> - </final> -</scxml> + <invoke type="http://www.w3.org/TR/scxml/"> + <!-- identical to test242sub1.scxml. --> + <content> + <scxml version="1.0" initial="subFinal2" datamodel="promela"> + <final id="subFinal2"/> + </scxml> + </content> + </invoke> + <!-- we got timeout last time, so we need it this time too --> + <transition event="timeout3" target="pass"/> + <transition event="done.invoke" target="fail"/> + </state> + + +<final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final> +<final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final> +</scxml>
\ No newline at end of file diff --git a/test/w3c/promela/test243.scxml b/test/w3c/promela/test243.scxml index c29d49f..886f732 100644 --- a/test/w3c/promela/test243.scxml +++ b/test/w3c/promela/test243.scxml @@ -4,7 +4,7 @@ test240sub1 will return success ifits Var1 is set to 1, failure otherwise. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <param name="Var1" expr="1"/> diff --git a/test/w3c/promela/test244.scxml b/test/w3c/promela/test244.scxml index 84b6ec3..87d1f0e 100644 --- a/test/w3c/promela/test244.scxml +++ b/test/w3c/promela/test244.scxml @@ -9,7 +9,7 @@ but should run correctly. --> </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" namelist="Var1"> <content> diff --git a/test/w3c/promela/test245.scxml b/test/w3c/promela/test245.scxml index 5f00a42..5f5db7f 100644 --- a/test/w3c/promela/test245.scxml +++ b/test/w3c/promela/test245.scxml @@ -7,7 +7,7 @@ invoked child's datamodel. It will will return success if its Var2 remains unbo </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" namelist="Var2"> <content> diff --git a/test/w3c/promela/test247.scxml b/test/w3c/promela/test247.scxml index 822f97d..383813b 100644 --- a/test/w3c/promela/test247.scxml +++ b/test/w3c/promela/test247.scxml @@ -3,7 +3,7 @@ <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/promela/test250.scxml b/test/w3c/promela/test250.scxml index e3f6b7a..0747224 100644 --- a/test/w3c/promela/test250.scxml +++ b/test/w3c/promela/test250.scxml @@ -12,7 +12,7 @@ Tester must examine log output from child process to determine success --> <scxml initial="sub0" version="1.0" datamodel="promela"> <state id="sub0" initial="sub01"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <transition event="timeout" target="subFinal"/> <onexit> diff --git a/test/w3c/promela/test252.scxml b/test/w3c/promela/test252.scxml index f4667ef..3a4a982 100644 --- a/test/w3c/promela/test252.scxml +++ b/test/w3c/promela/test252.scxml @@ -5,7 +5,7 @@ timeout indicates success. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="pass"/> <transition event="childToParent" target="fail"/> @@ -19,7 +19,7 @@ timeout indicates success. --> <scxml initial="sub0" version="1.0" datamodel="promela"> <state id="sub0"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <transition event="timeout" target="subFinal"/> <onexit> diff --git a/test/w3c/promela/test253.scxml b/test/w3c/promela/test253.scxml index 467f7ff..d8777ca 100644 --- a/test/w3c/promela/test253.scxml +++ b/test/w3c/promela/test253.scxml @@ -9,7 +9,7 @@ this process uses the scxml processor to send the message to it, otherwise failu </datamodel> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <invoke type="scxml" id="foo"> diff --git a/test/w3c/promela/test298.scxml b/test/w3c/promela/test298.scxml index 0f623b7..692b7da 100644 --- a/test/w3c/promela/test298.scxml +++ b/test/w3c/promela/test298.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="error.execution" target="pass"/> <transition event="*" target="fail"/> diff --git a/test/w3c/promela/test311.scxml b/test/w3c/promela/test311.scxml index 7ee4a33..8453a82 100644 --- a/test/w3c/promela/test311.scxml +++ b/test/w3c/promela/test311.scxml @@ -3,7 +3,7 @@ <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="promela" initial="s0"> <state id="s0"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> <assign location="foo.bar.baz " expr="1"/> </onentry> <transition event="error.execution" target="pass"/> diff --git a/test/w3c/promela/test338.scxml b/test/w3c/promela/test338.scxml index e7d97e4..46c702c 100644 --- a/test/w3c/promela/test338.scxml +++ b/test/w3c/promela/test338.scxml @@ -8,7 +8,7 @@ case where the invoke doesn't work correctly --> </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <invoke idlocation="Var1" type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/promela/test347.scxml b/test/w3c/promela/test347.scxml index 3b79584..4b70bcf 100644 --- a/test/w3c/promela/test347.scxml +++ b/test/w3c/promela/test347.scxml @@ -1,44 +1,40 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- test that the scxml event I/O processor works by sending events back and forth between an invoked child -and its parent process --> -<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0"> - <state id="s0" initial="s01"> - <invoke id="child" type="scxml"> +<?xml version="1.0" encoding="UTF-8"?><!-- test that the scxml event I/O processor works by sending events back and forth between an invoked child +and its parent process --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0"> + + +<state id="s0" initial="s01"> + <invoke id="child" type="scxml"> <content> - <scxml initial="sub0" version="1.0" datamodel="promela" name="machineName"> - <state id="sub0"> - <onentry> - <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_parent" event="childToParent"/> - </onentry> - <transition event="parentToChild" target="subFinal"/> - </state> - <final id="subFinal"/> - </scxml> - </content> - </invoke> - <onentry> - <send delay="20s" event="timeout"/> - </onentry> - <transition event="timeout" target="fail"/> - <state id="s01"> + <scxml initial="sub0" version="1.0" datamodel="promela" name="machineName"> + <state id="sub0"> + <onentry> + <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_parent" event="childToParent"/> + </onentry> + <transition event="parentToChild" target="subFinal"/> + </state> + <final id="subFinal"/> + </scxml> + </content> + </invoke> + <onentry> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="20000" event="timeout"/> + </onentry> + <transition event="timeout" target="fail"/> + + <state id="s01"> <transition event="childToParent" target="s02"/> - </state> - <state id="s02"> - <onentry> - <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_child" event="parentToChild"/> - </onentry> - <transition event="done.invoke" target="pass"/> - <transition event="error" target="fail"/> - </state> - </state> - <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="pass"> - <onentry> - <log label="Outcome" expr="'pass'"/> - </onentry> - </final> - <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="fail"> - <onentry> - <log label="Outcome" expr="'fail'"/> - </onentry> - </final> -</scxml> + </state> + + <state id="s02"> + <onentry> + <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_child" event="parentToChild"/> + </onentry> + <transition event="done.invoke" target="pass"/> + <transition event="error" target="fail"/> + </state> +</state> + + <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final> + <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final> + +</scxml>
\ No newline at end of file diff --git a/test/w3c/promela/test350.scxml b/test/w3c/promela/test350.scxml index 7ae6fe8..d356f22 100644 --- a/test/w3c/promela/test350.scxml +++ b/test/w3c/promela/test350.scxml @@ -9,7 +9,7 @@ able to send an event to itself using its own session ID as the target --> <state id="s0"> <onentry> <assign xmlns:scxml="http://www.w3.org/2005/07/scxml" location="Var1" expr="Var1 + Var2"/> - <send delay="5s" event="timeout"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" targetexpr="Var1" event="s0Event"/> </onentry> <transition event="s0Event" target="pass"/> diff --git a/test/w3c/promela/test351.scxml b/test/w3c/promela/test351.scxml index 956e006..5e2a5b0 100644 --- a/test/w3c/promela/test351.scxml +++ b/test/w3c/promela/test351.scxml @@ -7,7 +7,7 @@ </datamodel> <state id="s0"> <onentry> - <send delay="5s" event="timeout"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" id="send1" event="s0Event"/> </onentry> <transition event="s0Event" target="s1"> @@ -22,7 +22,7 @@ </state> <state id="s2"> <onentry> - <send delay="5s" event="timeout"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> <send event="s0Event2"/> </onentry> <transition event="s0Event2" target="s3"> diff --git a/test/w3c/promela/test352.scxml b/test/w3c/promela/test352.scxml index a964a04..a113c6a 100644 --- a/test/w3c/promela/test352.scxml +++ b/test/w3c/promela/test352.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0"> <onentry> - <send delay="5s" event="timeout"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" event="s0Event"/> </onentry> <transition event="s0Event" target="s1"> diff --git a/test/w3c/promela/test354.scxml b/test/w3c/promela/test354.scxml index 91932ca..5a5d234 100644 --- a/test/w3c/promela/test354.scxml +++ b/test/w3c/promela/test354.scxml @@ -9,7 +9,7 @@ and that correct values are used --> </datamodel> <state id="s0"> <onentry> - <send delay="5s" event="timeout"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> <send event="event1" type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" namelist="Var1"> <param name="param1" expr="2"/> </send> @@ -31,7 +31,7 @@ and that correct values are used --> </state> <state id="s3"> <onentry> - <send delay="5s" event="timeout"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> <send event="event2"> <content>123</content> </send> diff --git a/test/w3c/promela/test364.scxml b/test/w3c/promela/test364.scxml index 44ba527..585754d 100644 --- a/test/w3c/promela/test364.scxml +++ b/test/w3c/promela/test364.scxml @@ -5,7 +5,7 @@ If we get to s01111 we succeed, if any other state, failure. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="promela" initial="s1" version="1.0"> <state id="s1" initial="s11p112 s11p122"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="s11" initial="s111"> diff --git a/test/w3c/promela/test372.scxml b/test/w3c/promela/test372.scxml index 6062428..481f348 100644 --- a/test/w3c/promela/test372.scxml +++ b/test/w3c/promela/test372.scxml @@ -7,7 +7,7 @@ Var1 should be set to 2 (but not 3) by the time the event is raised --> </datamodel> <state id="s0" initial="s0final"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="done.state.s0" cond="Var1==2" target="pass"/> <transition event="*" target="fail"/> diff --git a/test/w3c/promela/test387.scxml b/test/w3c/promela/test387.scxml index 769d69b..9983f48 100644 --- a/test/w3c/promela/test387.scxml +++ b/test/w3c/promela/test387.scxml @@ -73,7 +73,7 @@ transition to s1's default deep history state. We should end up in s122, generat </state> <state id="s3"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition target="s0HistShallow"/> </state> diff --git a/test/w3c/promela/test388.scxml b/test/w3c/promela/test388.scxml index c6ffffc..1f9971b 100644 --- a/test/w3c/promela/test388.scxml +++ b/test/w3c/promela/test388.scxml @@ -14,7 +14,7 @@ state is s011, so we should get entering.s011, otherwise failure.--> </onentry> <!-- the first time through, go to s1, setting a timer just in case something hangs --> <transition event="entering.s012" cond="Var1==1" target="s1"> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </transition> <!-- the second time, we should get entering.s012. If so, go to s2, otherwise fail --> <transition event="entering.s012" cond="Var1==2" target="s2"/> diff --git a/test/w3c/promela/test399.scxml b/test/w3c/promela/test399.scxml index 5f4548a..574d303 100644 --- a/test/w3c/promela/test399.scxml +++ b/test/w3c/promela/test399.scxml @@ -4,7 +4,7 @@ that the event attribute of transition may contain multiple event designators. <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <!-- this will catch the failure case --> <transition event="timeout" target="fail"/> diff --git a/test/w3c/promela/test402.scxml b/test/w3c/promela/test402.scxml index 3888751..5de6f9f 100644 --- a/test/w3c/promela/test402.scxml +++ b/test/w3c/promela/test402.scxml @@ -5,7 +5,7 @@ are pulled off the internal queue in order, and that prefix matching works on th <state id="s0" initial="s01"> <onentry> <!-- catch the failure case --> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/promela/test403a.scxml b/test/w3c/promela/test403a.scxml index 5c8e398..7042e7b 100644 --- a/test/w3c/promela/test403a.scxml +++ b/test/w3c/promela/test403a.scxml @@ -10,7 +10,7 @@ matching transition in the child. --> <state id="s0" initial="s01"> <onentry> <!-- catch the failure case --> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <transition event="event1" target="fail"/> diff --git a/test/w3c/promela/test403c.scxml b/test/w3c/promela/test403c.scxml index 335fc2e..909d675 100644 --- a/test/w3c/promela/test403c.scxml +++ b/test/w3c/promela/test403c.scxml @@ -7,7 +7,7 @@ <state id="s0" initial="p0"> <onentry> <raise event="event1"/> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="event2" target="fail"/> <transition event="timeout" target="fail"/> diff --git a/test/w3c/promela/test405.scxml b/test/w3c/promela/test405.scxml index ce89b3a..7b61986 100644 --- a/test/w3c/promela/test405.scxml +++ b/test/w3c/promela/test405.scxml @@ -5,7 +5,7 @@ state machine is entered --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01p"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <parallel id="s01p"> diff --git a/test/w3c/promela/test406.scxml b/test/w3c/promela/test406.scxml index 99c4c40..b6928b6 100644 --- a/test/w3c/promela/test406.scxml +++ b/test/w3c/promela/test406.scxml @@ -5,7 +5,7 @@ order when the transition in s01 is taken --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/promela/test409.scxml b/test/w3c/promela/test409.scxml index 98e3c81..4ae15d7 100644 --- a/test/w3c/promela/test409.scxml +++ b/test/w3c/promela/test409.scxml @@ -5,7 +5,7 @@ be raised. Therefore the timeout should fire to indicate success --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delayexpr="'1s'"/> + <send event="timeout" delayexpr="1000"/> </onentry> <transition event="timeout" target="pass"/> <transition event="event1" target="fail"/> diff --git a/test/w3c/promela/test411.scxml b/test/w3c/promela/test411.scxml index aae7e3c..20b119b 100644 --- a/test/w3c/promela/test411.scxml +++ b/test/w3c/promela/test411.scxml @@ -6,7 +6,7 @@ timeout also indicates failure --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> <if cond="_x.states['s01']"> <raise event="event1"/> </if> diff --git a/test/w3c/promela/test412.scxml b/test/w3c/promela/test412.scxml index cc362be..564647b 100644 --- a/test/w3c/promela/test412.scxml +++ b/test/w3c/promela/test412.scxml @@ -4,7 +4,7 @@ and before the onentry handler of the child states. Event1, event2, and event3 <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <transition event="event1" target="fail"/> diff --git a/test/w3c/promela/test416.scxml b/test/w3c/promela/test416.scxml index 763a48a..ee747f4 100644 --- a/test/w3c/promela/test416.scxml +++ b/test/w3c/promela/test416.scxml @@ -3,7 +3,7 @@ <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s1" datamodel="promela"> <state id="s1" initial="s11"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="s11" initial="s111"> diff --git a/test/w3c/promela/test417.scxml b/test/w3c/promela/test417.scxml index abe4aa1..ed38eea 100644 --- a/test/w3c/promela/test417.scxml +++ b/test/w3c/promela/test417.scxml @@ -4,7 +4,7 @@ parallel elements children enter final states. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s1" datamodel="promela"> <state id="s1" initial="s1p1"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <parallel id="s1p1"> diff --git a/test/w3c/promela/test422.scxml b/test/w3c/promela/test422.scxml index bc99d52..12cbf2f 100644 --- a/test/w3c/promela/test422.scxml +++ b/test/w3c/promela/test422.scxml @@ -12,7 +12,7 @@ in s11. So we should receive invokeS1, invokeS12, but not invokeS12. Furthermor </datamodel> <state id="s1" initial="s11"> <onentry> - <send event="timeout" delayexpr="'2s'"/> + <send event="timeout" delayexpr="2000"/> </onentry> <transition event="invokeS1 invokeS12"> <assign xmlns:scxml="http://www.w3.org/2005/07/scxml" location="Var1" expr="Var1 + 1"/> diff --git a/test/w3c/promela/test423.scxml b/test/w3c/promela/test423.scxml index 6d87d30..5527d7f 100644 --- a/test/w3c/promela/test423.scxml +++ b/test/w3c/promela/test423.scxml @@ -4,7 +4,7 @@ <state id="s0"> <onentry> <send event="externalEvent1"/> - <send event="externalEvent2" delayexpr="'1s'"/> + <send event="externalEvent2" delayexpr="1000"/> <raise event="internalEvent"/> </onentry> <!-- in this state we should process only internalEvent --> diff --git a/test/w3c/promela/test501.scxml b/test/w3c/promela/test501.scxml index 02ae229..ea7f1ad 100644 --- a/test/w3c/promela/test501.scxml +++ b/test/w3c/promela/test501.scxml @@ -7,7 +7,7 @@ <state id="s0"> <onentry> <send targetexpr="Var1" event="foo"/> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <transition event="foo" target="pass"/> <transition event="*" target="fail"/> diff --git a/test/w3c/promela/test530.scxml b/test/w3c/promela/test530.scxml index c23eb9a..431802c 100644 --- a/test/w3c/promela/test530.scxml +++ b/test/w3c/promela/test530.scxml @@ -13,7 +13,7 @@ is evaluated at the right time, we should get invoke.done, otherwise an error - <final/> </scxml> </assign> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content expr="Var1"/> diff --git a/test/w3c/promela/test531.scxml b/test/w3c/promela/test531.scxml index 1e8cd15..d2ea9a6 100644 --- a/test/w3c/promela/test531.scxml +++ b/test/w3c/promela/test531.scxml @@ -4,7 +4,7 @@ of the raised event. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0"> <state id="s0"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> <send targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> <param name="_scxmleventname" expr="'test'"/> </send> diff --git a/test/w3c/promela/test532.scxml b/test/w3c/promela/test532.scxml index 69ffa54..356342d 100644 --- a/test/w3c/promela/test532.scxml +++ b/test/w3c/promela/test532.scxml @@ -4,7 +4,7 @@ as the name of the resulting event. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0"> <state id="s0"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> <send targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> <!-- this content will be ignored, but it's here to make sure we have a message body --> <content>some content</content> diff --git a/test/w3c/promela/test553.scxml b/test/w3c/promela/test553.scxml index ad056a8..7f641d4 100644 --- a/test/w3c/promela/test553.scxml +++ b/test/w3c/promela/test553.scxml @@ -5,7 +5,7 @@ of <send>'s args causes an error.. --> <state id="s0"> <onentry> <!-- timeout event --> - <send event="timeout" delayexpr="'1s'"/> + <send event="timeout" delayexpr="1000"/> <!-- generate an invalid namelist --> <send event="event1" namelist=""foo"/> </onentry> diff --git a/test/w3c/promela/test554.scxml b/test/w3c/promela/test554.scxml index b93888a..5832090 100644 --- a/test/w3c/promela/test554.scxml +++ b/test/w3c/promela/test554.scxml @@ -5,7 +5,7 @@ before the timer goes off. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela"> <state id="s0"> <onentry> - <send event="timer" delayexpr="'1s'"/> + <send event="timer" delayexpr="1000"/> </onentry> <!-- reference an invalid namelist --> <invoke type="http://www.w3.org/TR/scxml/" namelist=""foo"> diff --git a/test/w3c/promela/test567.scxml b/test/w3c/promela/test567.scxml index 50eb4bd..5d99e88 100644 --- a/test/w3c/promela/test567.scxml +++ b/test/w3c/promela/test567.scxml @@ -7,7 +7,7 @@ _event.data. --> </datamodel> <state id="s0"> <onentry> - <send event="timeout" delay="3s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> <!-- in this case, 'test' will be placed in _scxmleventname. The <param> should be used to populate _event.data --> <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> diff --git a/test/w3c/promela/test570.scxml b/test/w3c/promela/test570.scxml index 6ec678b..1a14640 100644 --- a/test/w3c/promela/test570.scxml +++ b/test/w3c/promela/test570.scxml @@ -6,7 +6,7 @@ </datamodel> <parallel id="p0"> <onentry> - <send event="timeout" delay="2s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> <raise event="e1"/> <raise event="e2"/> </onentry> diff --git a/test/w3c/promela/test576.scxml b/test/w3c/promela/test576.scxml index 1b40fd7..eeff4be 100644 --- a/test/w3c/promela/test576.scxml +++ b/test/w3c/promela/test576.scxml @@ -7,7 +7,7 @@ test that both are entered. --> </state> <state id="s1"> <onentry> - <send event="timeout" delay="1s"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="s11" initial="s111"> diff --git a/test/w3c/promela/test579.scxml b/test/w3c/promela/test579.scxml index 20419d8..8ed8ac1 100644 --- a/test/w3c/promela/test579.scxml +++ b/test/w3c/promela/test579.scxml @@ -14,7 +14,7 @@ parent state has been visited and exited, the default history content must not b </transition> </initial> <onentry> - <send delayexpr="'1s'" event="timeout"/> + <send delayexpr="1000" event="timeout"/> <raise event="event1"/> </onentry> <onexit> diff --git a/test/w3c/promela/test580.scxml b/test/w3c/promela/test580.scxml index ac1cbb7..34c5ae4 100644 --- a/test/w3c/promela/test580.scxml +++ b/test/w3c/promela/test580.scxml @@ -6,7 +6,7 @@ </datamodel> <parallel id="p1"> <onentry> - <send delay="2s" event="timeout"/> + <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> </onentry> <state id="s0"> <transition cond="_x.states['sh1']" target="fail"/> |