diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-03 01:10:03 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-03 01:10:03 (GMT) |
commit | b542369263782dc8b85893e218119ed070efa7b3 (patch) | |
tree | 0a18012a0af991755ceab98a457b46b79c14129f /test/w3c/ecma | |
parent | 193a01614dc3290eec51745a91be65c166c3763b (diff) | |
download | uscxml-b542369263782dc8b85893e218119ed070efa7b3.zip uscxml-b542369263782dc8b85893e218119ed070efa7b3.tar.gz uscxml-b542369263782dc8b85893e218119ed070efa7b3.tar.bz2 |
Got ready for cmake3 and some minor fixes
Diffstat (limited to 'test/w3c/ecma')
-rw-r--r-- | test/w3c/ecma/test252.scxml | 4 | ||||
-rw-r--r-- | test/w3c/ecma/test343.scxml | 2 | ||||
-rw-r--r-- | test/w3c/ecma/test354.scxml | 4 | ||||
-rw-r--r-- | test/w3c/ecma/test487.scxml | 3 | ||||
-rw-r--r-- | test/w3c/ecma/test553.scxml | 4 | ||||
-rw-r--r-- | test/w3c/ecma/test554.scxml | 4 |
6 files changed, 11 insertions, 10 deletions
diff --git a/test/w3c/ecma/test252.scxml b/test/w3c/ecma/test252.scxml index 14c6686..b33342b 100644 --- a/test/w3c/ecma/test252.scxml +++ b/test/w3c/ecma/test252.scxml @@ -5,7 +5,7 @@ timeout indicates success. --><scxml xmlns="http://www.w3.org/2005/07/scxml" x <state id="s0" initial="s01"> <onentry> - <send event="timeout" delay="2s"/> + <send event="timeout" delayexpr="'50ms'"/> </onentry> <transition event="timeout" target="pass"/> @@ -22,7 +22,7 @@ timeout indicates success. --><scxml xmlns="http://www.w3.org/2005/07/scxml" x <scxml initial="sub0" version="1.0" datamodel="ecmascript"> <state id="sub0"> <onentry> - <send event="timeout" delay="2s"/> + <send event="timeout" delayexpr="'25ms'"/> </onentry> <transition event="timeout" target="subFinal"/> <onexit> diff --git a/test/w3c/ecma/test343.scxml b/test/w3c/ecma/test343.scxml index 7f15cf0..a1455d9 100644 --- a/test/w3c/ecma/test343.scxml +++ b/test/w3c/ecma/test343.scxml @@ -14,7 +14,7 @@ </state> <final id="s02"> <donedata> - <param location="Varfoo" name="someParam"/> + <param location="foo.bar.baz " name="someParam"/> </donedata> </final> </state> diff --git a/test/w3c/ecma/test354.scxml b/test/w3c/ecma/test354.scxml index ef55794..6c544a4 100644 --- a/test/w3c/ecma/test354.scxml +++ b/test/w3c/ecma/test354.scxml @@ -37,10 +37,10 @@ and that correct values are used --><scxml xmlns="http://www.w3.org/2005/07/scxm <onentry> <send delay="5s" event="timeout"/> <send event="event2"> - <content>foo</content> + <content>123</content> </send> </onentry> - <transition event="event2" cond="_event.data == 'foo'" target="pass"/> + <transition event="event2" cond="_event.data == 123" target="pass"/> <transition event="*" target="fail"/> </state> diff --git a/test/w3c/ecma/test487.scxml b/test/w3c/ecma/test487.scxml index 30a50eb..5baacbe 100644 --- a/test/w3c/ecma/test487.scxml +++ b/test/w3c/ecma/test487.scxml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?><!-- test illegal assignment. error.execution should be raised. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0"> <datamodel> - <data id="Var1" expr="return"/> + <data id="Var1"/> </datamodel> <state id="s0"> <onentry> + <assign location="Var1" expr="return"/> <raise event="event"/> </onentry> diff --git a/test/w3c/ecma/test553.scxml b/test/w3c/ecma/test553.scxml index 0beddea..0df3c3e 100644 --- a/test/w3c/ecma/test553.scxml +++ b/test/w3c/ecma/test553.scxml @@ -6,8 +6,8 @@ of <send>'s args causes an error.. --><scxml xmlns="http://www.w3.org/2005/07/s <onentry> <!-- timeout event --> <send event="timeout" delayexpr="'50ms'"/> - <!-- include a non-existing var in the namelist --> - <send event="event1" namelist="Var2"/> + <!-- generate an invalid namelist --> + <send event="event1" namelist=""foo""/> </onentry> <!-- if we get the timeout before event1, we assume that event1 hasn't been sent diff --git a/test/w3c/ecma/test554.scxml b/test/w3c/ecma/test554.scxml index 960f5ac..764241e 100644 --- a/test/w3c/ecma/test554.scxml +++ b/test/w3c/ecma/test554.scxml @@ -8,8 +8,8 @@ before the timer goes off. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xm <send event="timer" delayexpr="'50ms'"/> </onentry> - <!-- namelist references an undeclared variable --> - <invoke type="http://www.w3.org/TR/scxml/" namelist="Var2"> + <!-- reference an invalid namelist --> + <invoke type="http://www.w3.org/TR/scxml/" namelist=""foo""> <content> <scxml initial="subFinal" version="1.0" datamodel="ecmascript"> <final id="subFinal"/> |