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/xpath | |
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/xpath')
-rw-r--r-- | test/w3c/xpath/test175.scxml | 4 | ||||
-rw-r--r-- | test/w3c/xpath/test185.scxml | 2 | ||||
-rw-r--r-- | test/w3c/xpath/test186.scxml | 2 | ||||
-rw-r--r-- | test/w3c/xpath/test187.scxml | 4 | ||||
-rw-r--r-- | test/w3c/xpath/test207.scxml | 6 | ||||
-rw-r--r-- | test/w3c/xpath/test208.scxml | 4 | ||||
-rw-r--r-- | test/w3c/xpath/test210.scxml | 4 | ||||
-rw-r--r-- | test/w3c/xpath/test236.scxml | 2 | ||||
-rw-r--r-- | test/w3c/xpath/test237.scxml | 6 | ||||
-rw-r--r-- | test/w3c/xpath/test409.scxml | 2 | ||||
-rw-r--r-- | test/w3c/xpath/test422.scxml | 2 | ||||
-rw-r--r-- | test/w3c/xpath/test423.scxml | 2 | ||||
-rw-r--r-- | test/w3c/xpath/test553.scxml | 2 | ||||
-rw-r--r-- | test/w3c/xpath/test554.scxml | 2 | ||||
-rw-r--r-- | test/w3c/xpath/test579.scxml | 2 |
15 files changed, 23 insertions, 23 deletions
diff --git a/test/w3c/xpath/test175.scxml b/test/w3c/xpath/test175.scxml index 8dfd670..67fa473 100644 --- a/test/w3c/xpath/test175.scxml +++ b/test/w3c/xpath/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'"/> + <assign location="$Var1" expr="'1s'"/> <send delayexpr="$Var1" event="event2"/> - <send delay="1s" event="event1"/> + <send delayexpr="'.5s'" event="event1"/> </onentry> <transition event="event1" target="s1"/> diff --git a/test/w3c/xpath/test185.scxml b/test/w3c/xpath/test185.scxml index c6b4b48..387086d 100644 --- a/test/w3c/xpath/test185.scxml +++ b/test/w3c/xpath/test185.scxml @@ -4,7 +4,7 @@ <state id="s0"> <onentry> - <send event="event2" delay="2s"/> + <send event="event2" delayexpr="'1s'"/> <send event="event1"/> </onentry> diff --git a/test/w3c/xpath/test186.scxml b/test/w3c/xpath/test186.scxml index 8353bf2..8121a17 100644 --- a/test/w3c/xpath/test186.scxml +++ b/test/w3c/xpath/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="'1s'"> <param name="aParam" expr="$Var1/text()"/> </send> <assign location="$Var1" expr="2"/> diff --git a/test/w3c/xpath/test187.scxml b/test/w3c/xpath/test187.scxml index 12cbb8b..5cbb817 100644 --- a/test/w3c/xpath/test187.scxml +++ b/test/w3c/xpath/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="'1s'"/> </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="xpath"> <state id="sub0"> <onentry> - <send event="childToParent" target="#_parent" delay="1s"/> + <send event="childToParent" target="#_parent" delayexpr="'.5s'"/> </onentry> <transition target="subFinal"/> </state> diff --git a/test/w3c/xpath/test207.scxml b/test/w3c/xpath/test207.scxml index e74ec8f..b99e511 100644 --- a/test/w3c/xpath/test207.scxml +++ b/test/w3c/xpath/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="'2s'"/> </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="xpath"> <state id="sub0"> <onentry> - <send event="event1" id="foo" delay="3s"/> - <send event="event2" delay="5s"/> + <send event="event1" id="foo" delayexpr="'1s'"/> + <send event="event2" delayexpr="'1.5s'"/> <send target="#_parent" event="childToParent"/> </onentry> diff --git a/test/w3c/xpath/test208.scxml b/test/w3c/xpath/test208.scxml index e768e7c..4aa9ebe 100644 --- a/test/w3c/xpath/test208.scxml +++ b/test/w3c/xpath/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="'1s'"/> + <send event="event2" delayexpr="'1.5s'"/> <cancel sendid="foo"/> </onentry> diff --git a/test/w3c/xpath/test210.scxml b/test/w3c/xpath/test210.scxml index 5ec8f23..17dfc95 100644 --- a/test/w3c/xpath/test210.scxml +++ b/test/w3c/xpath/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="'1s'"/> + <send event="event2" delayexpr="'1.5s'"/> <assign location="$Var1" expr="'foo'"/> <cancel sendidexpr="$Var1"/> </onentry> diff --git a/test/w3c/xpath/test236.scxml b/test/w3c/xpath/test236.scxml index 2c2d41a..0964f71 100644 --- a/test/w3c/xpath/test236.scxml +++ b/test/w3c/xpath/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="'2s'"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/xpath/test237.scxml b/test/w3c/xpath/test237.scxml index 19c2480..a81e36a 100644 --- a/test/w3c/xpath/test237.scxml +++ b/test/w3c/xpath/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="'1s'"/> </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="xpath"> <state id="sub0"> <onentry> - <send event="timeout" delay="2s"/> + <send event="timeout" delayexpr="'2s'"/> </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="'1.5s'"/> </onentry> <!-- here we should NOT get done.invoke --> <transition event="done.invoke" target="fail"/> diff --git a/test/w3c/xpath/test409.scxml b/test/w3c/xpath/test409.scxml index 2d5a63d..e321d46 100644 --- a/test/w3c/xpath/test409.scxml +++ b/test/w3c/xpath/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="'1s'"/> </onentry> <transition event="timeout" target="pass"/> diff --git a/test/w3c/xpath/test422.scxml b/test/w3c/xpath/test422.scxml index f62098d..4ef15ce 100644 --- a/test/w3c/xpath/test422.scxml +++ b/test/w3c/xpath/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="'2s'"/> </onentry> <transition event="invokeS1 invokeS12"> <assign location="$Var1" expr="$Var1 + 1"/> diff --git a/test/w3c/xpath/test423.scxml b/test/w3c/xpath/test423.scxml index 7726963..f3bf8c8 100644 --- a/test/w3c/xpath/test423.scxml +++ b/test/w3c/xpath/test423.scxml @@ -4,7 +4,7 @@ <state id="s0"> <onentry> <send event="externalEvent1"/> - <send event="externalEvent2" delay="1s"/> + <send event="externalEvent2" delayexpr="'1s'"/> <raise event="internalEvent"/> </onentry> <!-- in this state we should process only internalEvent --> diff --git a/test/w3c/xpath/test553.scxml b/test/w3c/xpath/test553.scxml index eb6f24b..00bd1e8 100644 --- a/test/w3c/xpath/test553.scxml +++ b/test/w3c/xpath/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="'1s'"/> <!-- include a non-existing var in the namelist --> <send event="event1" namelist="$Var2"/> </onentry> diff --git a/test/w3c/xpath/test554.scxml b/test/w3c/xpath/test554.scxml index 64274aa..1a2b58a 100644 --- a/test/w3c/xpath/test554.scxml +++ b/test/w3c/xpath/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="'1s'"/> </onentry> <!-- namelist references an undeclared variable --> diff --git a/test/w3c/xpath/test579.scxml b/test/w3c/xpath/test579.scxml index 311c0a9..28cdf28 100644 --- a/test/w3c/xpath/test579.scxml +++ b/test/w3c/xpath/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="'1s'" event="timeout"/> <raise event="event1"/> </onentry> <onexit> |