diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-01 22:51:30 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-01 22:51:30 (GMT) |
commit | 945160d0539ad119ffc986fac712db76c7203e84 (patch) | |
tree | c43e4a7db898026bc62cc20af5061d07736f847e /test/w3c/ecma | |
parent | c70d02010ea99e6c8e35da3b767f41f1ee5dce56 (diff) | |
download | uscxml-945160d0539ad119ffc986fac712db76c7203e84.zip uscxml-945160d0539ad119ffc986fac712db76c7203e84.tar.gz uscxml-945160d0539ad119ffc986fac712db76c7203e84.tar.bz2 |
More polishing for bindings C# and Java
Diffstat (limited to 'test/w3c/ecma')
-rw-r--r-- | test/w3c/ecma/test175.scxml | 6 | ||||
-rw-r--r-- | test/w3c/ecma/test185.scxml | 2 | ||||
-rw-r--r-- | test/w3c/ecma/test186.scxml | 2 | ||||
-rw-r--r-- | test/w3c/ecma/test187.scxml | 4 | ||||
-rw-r--r-- | test/w3c/ecma/test207.scxml | 6 | ||||
-rw-r--r-- | test/w3c/ecma/test208.scxml | 4 | ||||
-rw-r--r-- | test/w3c/ecma/test210.scxml | 4 | ||||
-rw-r--r-- | test/w3c/ecma/test236.scxml | 2 | ||||
-rw-r--r-- | test/w3c/ecma/test237.scxml | 6 | ||||
-rw-r--r-- | test/w3c/ecma/test409.scxml | 2 | ||||
-rw-r--r-- | test/w3c/ecma/test422.scxml | 2 | ||||
-rw-r--r-- | test/w3c/ecma/test423.scxml | 2 | ||||
-rw-r--r-- | test/w3c/ecma/test553.scxml | 2 | ||||
-rw-r--r-- | test/w3c/ecma/test554.scxml | 2 | ||||
-rw-r--r-- | test/w3c/ecma/test579.scxml | 2 |
15 files changed, 24 insertions, 24 deletions
diff --git a/test/w3c/ecma/test175.scxml b/test/w3c/ecma/test175.scxml index 4876821..cda3b5a 100644 --- a/test/w3c/ecma/test175.scxml +++ b/test/w3c/ecma/test175.scxml @@ -7,9 +7,9 @@ event1 will be raised first. Succeed if event1 occurs before event2, otherwise <state id="s0"> <onentry> - <assign location="Var1" expr="'3s'"/> - <send delayexpr="Var1" event="event2"/> - <send delay="1s" event="event1"/> + <assign location="Var1" expr="'1s'"/> + <send delayexpr="(Var1.slice(0, - 1)) * 50 + 'ms'" event="event2"/> + <send delayexpr="'25ms'" event="event1"/> </onentry> <transition event="event1" target="s1"/> diff --git a/test/w3c/ecma/test185.scxml b/test/w3c/ecma/test185.scxml index cdf8a77..6a83574 100644 --- a/test/w3c/ecma/test185.scxml +++ b/test/w3c/ecma/test185.scxml @@ -4,7 +4,7 @@ <state id="s0"> <onentry> - <send event="event2" delay="2s"/> + <send event="event2" delayexpr="'50ms'"/> <send event="event1"/> </onentry> diff --git a/test/w3c/ecma/test186.scxml b/test/w3c/ecma/test186.scxml index 20f0063..68254d3 100644 --- a/test/w3c/ecma/test186.scxml +++ b/test/w3c/ecma/test186.scxml @@ -8,7 +8,7 @@ in the interval.) If var2 ends up == 1, we pass. Otherwise we fail --><scxml <state id="s0"> <onentry> - <send event="event1" delay="2s"> + <send event="event1" delayexpr="'50ms'"> <param name="aParam" expr="Var1"/> </send> <assign location="Var1" expr="2"/> diff --git a/test/w3c/ecma/test187.scxml b/test/w3c/ecma/test187.scxml index d03c16d..c4f2a6f 100644 --- a/test/w3c/ecma/test187.scxml +++ b/test/w3c/ecma/test187.scxml @@ -6,7 +6,7 @@ parent session, should not receive childToParent. If it does, we fail. Otherwis <state id="s0"> <onentry> - <send event="timeout" delay="10s"/> + <send event="timeout" delayexpr="'50ms'"/> </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="ecmascript"> <state id="sub0"> <onentry> - <send event="childToParent" target="#_parent" delay="1s"/> + <send event="childToParent" target="#_parent" delayexpr="'25ms'"/> </onentry> <transition target="subFinal"/> </state> diff --git a/test/w3c/ecma/test207.scxml b/test/w3c/ecma/test207.scxml index aa5786a..fe30bf1 100644 --- a/test/w3c/ecma/test207.scxml +++ b/test/w3c/ecma/test207.scxml @@ -6,7 +6,7 @@ raised in another session, but the spec doesn't define any way to refer to an ev <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="10s"/> + <send event="timeout" delayexpr="'100ms'"/> </onentry> <invoke type="scxml"> <content> @@ -18,8 +18,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="ecmascript"> <state id="sub0"> <onentry> - <send event="event1" id="foo" delay="3s"/> - <send event="event2" delay="5s"/> + <send event="event1" id="foo" delayexpr="'50ms'"/> + <send event="event2" delayexpr="'75ms'"/> <send target="#_parent" event="childToParent"/> </onentry> diff --git a/test/w3c/ecma/test208.scxml b/test/w3c/ecma/test208.scxml index 6faa9c1..043e537 100644 --- a/test/w3c/ecma/test208.scxml +++ b/test/w3c/ecma/test208.scxml @@ -4,8 +4,8 @@ we get event1 or an error first, cancel didn't work and we fail. --><scxml xmln <state id="s0"> <onentry> - <send id="foo" event="event1" delay="1s"/> - <send event="event2" delay="5s"/> + <send id="foo" event="event1" delayexpr="'50ms'"/> + <send event="event2" delayexpr="'75ms'"/> <cancel sendid="foo"/> </onentry> diff --git a/test/w3c/ecma/test210.scxml b/test/w3c/ecma/test210.scxml index e29b65d..f103ecd 100644 --- a/test/w3c/ecma/test210.scxml +++ b/test/w3c/ecma/test210.scxml @@ -6,8 +6,8 @@ delayed event1. Thus we get event2 first and pass. If we get event1 or an erro <state id="s0"> <onentry> - <send id="foo" event="event1" delay="1s"/> - <send event="event2" delay="5s"/> + <send id="foo" event="event1" delayexpr="'50ms'"/> + <send event="event2" delayexpr="'75ms'"/> <assign location="Var1" expr="'foo'"/> <cancel sendidexpr="Var1"/> </onentry> diff --git a/test/w3c/ecma/test236.scxml b/test/w3c/ecma/test236.scxml index 700c6f8..acb1cda 100644 --- a/test/w3c/ecma/test236.scxml +++ b/test/w3c/ecma/test236.scxml @@ -5,7 +5,7 @@ events after the done.invoke. Hence timeout indicates success --><scxml xmlns <state id="s0"> <onentry> - <send event="timeout" delay="2s"/> + <send event="timeout" delayexpr="'100ms'"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/ecma/test237.scxml b/test/w3c/ecma/test237.scxml index b23811d..442b04c 100644 --- a/test/w3c/ecma/test237.scxml +++ b/test/w3c/ecma/test237.scxml @@ -6,7 +6,7 @@ the time timeout2 fires, success --><scxml xmlns="http://www.w3.org/2005/07/sc <state id="s0"> <onentry> - <send event="timeout1" delay="1s"/> + <send event="timeout1" delayexpr="'50ms'"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> @@ -14,7 +14,7 @@ the time timeout2 fires, success --><scxml xmlns="http://www.w3.org/2005/07/sc <scxml initial="sub0" version="1.0" datamodel="ecmascript"> <state id="sub0"> <onentry> - <send event="timeout" delay="2s"/> + <send event="timeout" delayexpr="'100ms'"/> </onentry> <transition event="timeout" target="subFinal"/> </state> @@ -29,7 +29,7 @@ the time timeout2 fires, success --><scxml xmlns="http://www.w3.org/2005/07/sc <state id="s1"> <onentry> - <send event="timeout2" delay="2s"/> + <send event="timeout2" delayexpr="'75ms'"/> </onentry> <!-- here we should NOT get done.invoke --> <transition event="done.invoke" target="fail"/> diff --git a/test/w3c/ecma/test409.scxml b/test/w3c/ecma/test409.scxml index 9b4f1aa..0fa71a2 100644 --- a/test/w3c/ecma/test409.scxml +++ b/test/w3c/ecma/test409.scxml @@ -5,7 +5,7 @@ be raised. Therefore the timeout should fire to indicate success --><scxml xm <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="1s"/> + <send event="timeout" delayexpr="'50ms'"/> </onentry> <transition event="timeout" target="pass"/> diff --git a/test/w3c/ecma/test422.scxml b/test/w3c/ecma/test422.scxml index 803f75f..637ff77 100644 --- a/test/w3c/ecma/test422.scxml +++ b/test/w3c/ecma/test422.scxml @@ -10,7 +10,7 @@ in s11. So we should receive invokeS1, invokeS12, but not invokeS12. Furthermor </datamodel> <state id="s1" initial="s11"> <onentry> - <send event="timeout" delay="5s"/> + <send event="timeout" delayexpr="'100ms'"/> </onentry> <transition event="invokeS1 invokeS12"> <assign location="Var1" expr="Var1 + 1"/> diff --git a/test/w3c/ecma/test423.scxml b/test/w3c/ecma/test423.scxml index f6287ab..ab6c84f 100644 --- a/test/w3c/ecma/test423.scxml +++ b/test/w3c/ecma/test423.scxml @@ -4,7 +4,7 @@ <state id="s0"> <onentry> <send event="externalEvent1"/> - <send event="externalEvent2" delay="1s"/> + <send event="externalEvent2" delayexpr="'50ms'"/> <raise event="internalEvent"/> </onentry> <!-- in this state we should process only internalEvent --> diff --git a/test/w3c/ecma/test553.scxml b/test/w3c/ecma/test553.scxml index 114c4a2..0beddea 100644 --- a/test/w3c/ecma/test553.scxml +++ b/test/w3c/ecma/test553.scxml @@ -5,7 +5,7 @@ of <send>'s args causes an error.. --><scxml xmlns="http://www.w3.org/2005/07/s <state id="s0"> <onentry> <!-- timeout event --> - <send event="timeout" delay="3s"/> + <send event="timeout" delayexpr="'50ms'"/> <!-- include a non-existing var in the namelist --> <send event="event1" namelist="Var2"/> </onentry> diff --git a/test/w3c/ecma/test554.scxml b/test/w3c/ecma/test554.scxml index b328ae9..960f5ac 100644 --- a/test/w3c/ecma/test554.scxml +++ b/test/w3c/ecma/test554.scxml @@ -5,7 +5,7 @@ before the timer goes off. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xm <state id="s0"> <onentry> - <send event="timer" delay="2s"/> + <send event="timer" delayexpr="'50ms'"/> </onentry> <!-- namelist references an undeclared variable --> diff --git a/test/w3c/ecma/test579.scxml b/test/w3c/ecma/test579.scxml index f89b1a9..c315f82 100644 --- a/test/w3c/ecma/test579.scxml +++ b/test/w3c/ecma/test579.scxml @@ -14,7 +14,7 @@ parent state has been visited and exited, the default history content must not b </transition> </initial> <onentry> - <send delay="2s" event="timeout"/> + <send delayexpr="'50ms'" event="timeout"/> <raise event="event1"/> </onentry> <onexit> |