diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-05-14 11:35:34 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-05-14 11:35:34 (GMT) |
| commit | 1453feb7ca59167c219afb21dfba4ed3ea68d176 (patch) | |
| tree | a54462ad1d506964c089420e1d8807f6ac1ce770 | |
| parent | 6103616a5d463c2ecd8a274b4dff0a404ab35dde (diff) | |
| download | uscxml-1453feb7ca59167c219afb21dfba4ed3ea68d176.zip uscxml-1453feb7ca59167c219afb21dfba4ed3ea68d176.tar.gz uscxml-1453feb7ca59167c219afb21dfba4ed3ea68d176.tar.bz2 | |
Renamed macro and updated W3C Lua tests
77 files changed, 157 insertions, 160 deletions
diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp index 61277bd..5defce3 100644 --- a/src/uscxml/interpreter/BasicContentExecutor.cpp +++ b/src/uscxml/interpreter/BasicContentExecutor.cpp @@ -67,7 +67,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { sendEvent.name = ATTR(element, kXMLCharEvent); } } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element eventexpr", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in send element eventexpr", element); } try { @@ -78,7 +78,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { target = ATTR(element, kXMLCharTarget); } } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element targetexpr", element); + ERROR_EXECUTION_RETHROW(e,"Syntax error in send element targetexpr", element); } try { @@ -89,7 +89,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { type = ATTR(element, kXMLCharType); } } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element typeexpr", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in send element typeexpr", element); } try { @@ -124,7 +124,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { } } } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element idlocation", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in send element idlocation", element); } try { @@ -148,14 +148,14 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { } } } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element delayexpr", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in send element delayexpr", element); } try { // namelist processNameLists(sendEvent.namelist, element); } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element namelist", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in send element namelist", element); } @@ -163,7 +163,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { // params processParams(sendEvent.params, element); } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element param expr", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in send element param expr", element); } try { @@ -173,7 +173,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { sendEvent.data = elementAsData(contents.front()); } } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element content", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in send element content", element); } // if (sendReq->dom) { @@ -431,14 +431,14 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) { element->setUserData(kXMLCharInvokeId, (void*)invokeId, NULL); } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in invoke element idlocation", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in invoke element idlocation", element); } try { // namelist processNameLists(invokeEvent.namelist, element); } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element namelist", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in send element namelist", element); } @@ -446,7 +446,7 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) { // params processParams(invokeEvent.params, element); } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in send element param expr", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in send element param expr", element); } try { @@ -467,7 +467,7 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) { #endif } } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in invoke element content", element); + ERROR_EXECUTION_RETHROW(e, "Syntax error in invoke element content", element); } // autoforward @@ -513,7 +513,7 @@ void BasicContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC // namelist processNameLists(doneEvent.namelist, doneData); } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in donedata element namelist", doneData); + ERROR_EXECUTION_RETHROW(e, "Syntax error in donedata element namelist", doneData); } @@ -521,7 +521,7 @@ void BasicContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC // params processParams(doneEvent.params, doneData); } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in donedata element param expr", doneData); + ERROR_EXECUTION_RETHROW(e, "Syntax error in donedata element param expr", doneData); } try { @@ -531,7 +531,7 @@ void BasicContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC doneEvent.data = elementAsData(contents.front()); } } catch (Event e) { - ERROR_EXECUTION_THROW3(e,"Syntax error in donedata element content", doneData); + ERROR_EXECUTION_RETHROW(e, "Syntax error in donedata element content", doneData); } } catch (ErrorEvent exc) { diff --git a/src/uscxml/messages/Event.h b/src/uscxml/messages/Event.h index fd9dd42..f40a672 100644 --- a/src/uscxml/messages/Event.h +++ b/src/uscxml/messages/Event.h @@ -23,13 +23,14 @@ #include "uscxml/messages/Data.h" #include "uscxml/util/UUID.h" -#define ERROR_PLATFORM_THROW(msg) \ +#define ERROR_PLATFORM_THROW(cause) \ uscxml::ErrorEvent e; \ e.name = "error.platform"; \ - e.data.compound["cause"] = uscxml::Data(msg, uscxml::Data::VERBATIM); \ + e.data.compound["cause"] = uscxml::Data(cause, uscxml::Data::VERBATIM); \ e.data.compound["file"] = uscxml::Data(uscxml::toStr(__FILE__), uscxml::Data::VERBATIM); \ e.data.compound["line"] = uscxml::Data(uscxml::toStr(__LINE__), uscxml::Data::INTERPRETED); \ - throw e; \ + e.eventType = uscxml::Event::PLATFORM; \ + throw e; #define ERROR_EXECUTION(identifier, cause) \ uscxml::ErrorEvent identifier; \ @@ -77,10 +78,9 @@ throw exc;\ } -#define ERROR_EXECUTION_THROW3(evt,caption,node) \ +#define ERROR_EXECUTION_RETHROW(exc, caption, node) \ {\ - auto it = evt.data.compound.find("cause"); \ - ERROR_EXECUTION2(exc,it!=evt.data.compound.end() ? it->second.atom : "",node); \ + exc.data.compound["xpath"] = uscxml::Data(DOMUtils::xPathForNode(node), uscxml::Data::VERBATIM); \ exc.data.compound["caption"] = uscxml::Data(caption, uscxml::Data::VERBATIM); \ throw exc;\ } diff --git a/test/w3c/convert-tests.sh b/test/w3c/convert-tests.sh index 9e23efd..bdac001 100755 --- a/test/w3c/convert-tests.sh +++ b/test/w3c/convert-tests.sh @@ -8,6 +8,13 @@ ME=`basename $0` DIR="$( cd "$( dirname "$0" )" && pwd )" cd $DIR +if [ "$#" -lt 1 ]; then + echo "At least one datamodel needs to be specified:" + echo " $0 ecma c89 lua jexl namespace xpath promela prolog" + exit 1 +fi + + while [ "$1" != "" ]; do case $1 in ecma ) @@ -83,6 +90,10 @@ if [ "$LUA" != "" ]; then # x-www-form-urlencode will not preserve the type and we default to string sed -i.orig 's/Var1==2/tonumber(Var1)==2/g' ./lua/test567.scxml + + # we can pass test562 even though it it ecmascript specific + sed -i.orig 's/datamodel=\"ecmascript\"/datamodel=\"lua\"/g' ./lua/test562.scxml + fi if [ "$NAMESPACE" != "" ]; then diff --git a/test/w3c/lua/test156.scxml b/test/w3c/lua/test156.scxml index 7581b42..8f1e14c 100644 --- a/test/w3c/lua/test156.scxml +++ b/test/w3c/lua/test156.scxml @@ -14,7 +14,7 @@ should cause an error, so var1 should be incremented only once --> <foreach item="Var2" array="Var3"> <assign xmlns:scxml="http://www.w3.org/2005/07/scxml" location="Var1" expr="Var1 + 1"/> <!-- assign an illegal value to a non-existent var --> - <assign location="Var5" expr="return"/> + <assign location="Var5" expr="return#"/> </foreach> </onentry> <transition cond="Var1==1" target="pass"/> diff --git a/test/w3c/lua/test191.scxml b/test/w3c/lua/test191.scxml index a30b6c2..a245b44 100644 --- a/test/w3c/lua/test191.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000s" event="timeout"/> + <send event="timeout" delay="5s"/> </onentry> <invoke type="scxml"> <content> diff --git a/test/w3c/lua/test192.scxml b/test/w3c/lua/test192.scxml index a504b48..873c583 100644 --- a/test/w3c/lua/test192.scxml +++ b/test/w3c/lua/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="lua" version="1.0"> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send event="timeout" delay="5s"/> </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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> </onentry> <transition event="parentToChild" target="subFinal"> <send target="#_parent" event="eventReceived"/> diff --git a/test/w3c/lua/test193.scxml b/test/w3c/lua/test193.scxml index e8ab624..568f127 100644 --- a/test/w3c/lua/test193.scxml +++ b/test/w3c/lua/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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="event1" target="fail"/> <transition event="internal" target="s1"/> diff --git a/test/w3c/lua/test215.scxml b/test/w3c/lua/test215.scxml index db875be..4c63336 100644 --- a/test/w3c/lua/test215.scxml +++ b/test/w3c/lua/test215.scxml @@ -8,7 +8,7 @@ the runtime value is used, the invocation will succeed --> </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send event="timeout" delay="5s"/> <assign location="Var1" expr="'http://www.w3.org/TR/scxml/'"/> </onentry> <invoke typeexpr="Var1"> diff --git a/test/w3c/lua/test216.scxml b/test/w3c/lua/test216.scxml index db285ab..12d77db 100644 --- a/test/w3c/lua/test216.scxml +++ b/test/w3c/lua/test216.scxml @@ -8,7 +8,7 @@ the runtime value is used, the invocation will succeed --> </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send event="timeout" delay="5s"/> <assign location="Var1" expr="'file:test216sub1.scxml'"/> </onentry> <invoke srcexpr="Var1" type="http://www.w3.org/TR/scxml"/> diff --git a/test/w3c/lua/test220.scxml b/test/w3c/lua/test220.scxml index e60d070..262215e 100644 --- a/test/w3c/lua/test220.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send event="timeout" delay="5s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/lua/test223.scxml b/test/w3c/lua/test223.scxml index 8993a17..e80dd28 100644 --- a/test/w3c/lua/test223.scxml +++ b/test/w3c/lua/test223.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" idlocation="Var1"> <content> diff --git a/test/w3c/lua/test224.scxml b/test/w3c/lua/test224.scxml index 089d749..4ab2450 100644 --- a/test/w3c/lua/test224.scxml +++ b/test/w3c/lua/test224.scxml @@ -7,7 +7,7 @@ </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" idlocation="Var1"> <content> diff --git a/test/w3c/lua/test225.scxml b/test/w3c/lua/test225.scxml index 3b264c1..5dd004a 100644 --- a/test/w3c/lua/test225.scxml +++ b/test/w3c/lua/test225.scxml @@ -7,7 +7,7 @@ </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" idlocation="Var1"> <content> diff --git a/test/w3c/lua/test226.scxml b/test/w3c/lua/test226.scxml index 7b0c084..9e3a88b 100644 --- a/test/w3c/lua/test226.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" src="file:test226sub1.scxml"> <param name="Var1" expr="1"/> diff --git a/test/w3c/lua/test228.scxml b/test/w3c/lua/test228.scxml index ed46aa6..6ce3ade 100644 --- a/test/w3c/lua/test228.scxml +++ b/test/w3c/lua/test228.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" id="foo"> <content> diff --git a/test/w3c/lua/test229.scxml b/test/w3c/lua/test229.scxml index 6b043da..4b4192c 100644 --- a/test/w3c/lua/test229.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> </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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> </onentry> <transition event="childToParent" target="subFinal"> <send target="#_parent" event="eventReceived"/> diff --git a/test/w3c/lua/test230.scxml b/test/w3c/lua/test230.scxml index ee1b53a..93dc23b 100644 --- a/test/w3c/lua/test230.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> </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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <transition event="childToParent" target="subFinal"> <log label="name is " expr="_event.name"/> diff --git a/test/w3c/lua/test232.scxml b/test/w3c/lua/test232.scxml index 3ce904e..fb8ac9c 100644 --- a/test/w3c/lua/test232.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/lua/test233.scxml b/test/w3c/lua/test233.scxml index 656abee..6514cca 100644 --- a/test/w3c/lua/test233.scxml +++ b/test/w3c/lua/test233.scxml @@ -8,7 +8,7 @@ the transtitions. --> </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/lua/test234.scxml b/test/w3c/lua/test234.scxml index 7deec7f..81aed55 100644 --- a/test/w3c/lua/test234.scxml +++ b/test/w3c/lua/test234.scxml @@ -10,7 +10,7 @@ var2 should still be set to 1 --> </datamodel> <parallel id="p0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> </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="lua"> <state id="sub0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <transition event="timeout" target="subFinal2"/> </state> diff --git a/test/w3c/lua/test235.scxml b/test/w3c/lua/test235.scxml index d12daef..f07107a 100644 --- a/test/w3c/lua/test235.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" id="foo"> <content> diff --git a/test/w3c/lua/test239.scxml b/test/w3c/lua/test239.scxml index fa97a62..877fd56 100644 --- a/test/w3c/lua/test239.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/lua/test240.scxml b/test/w3c/lua/test240.scxml index ec5ca38..a71cc37 100644 --- a/test/w3c/lua/test240.scxml +++ b/test/w3c/lua/test240.scxml @@ -9,7 +9,7 @@ should run correctly. --> </datamodel> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/lua/test241.scxml b/test/w3c/lua/test241.scxml index ebe5afe..53da8d1 100644 --- a/test/w3c/lua/test241.scxml +++ b/test/w3c/lua/test241.scxml @@ -9,7 +9,7 @@ Var1, but should run correctly. --> </datamodel> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/lua/test242.scxml b/test/w3c/lua/test242.scxml index 47a9ed6..4e0132b 100644 --- a/test/w3c/lua/test242.scxml +++ b/test/w3c/lua/test242.scxml @@ -4,7 +4,7 @@ either we get done.invoke in both cases or in neither case (in which case we tim <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="lua"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout1" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <invoke type="http://www.w3.org/TR/scxml/" src="file:test242sub1.scxml"/> @@ -13,7 +13,7 @@ either we get done.invoke in both cases or in neither case (in which case we tim </state> <state id="s02"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout2" delay="1s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <!-- identical to test242sub1.scxml. --> @@ -29,7 +29,7 @@ either we get done.invoke in both cases or in neither case (in which case we tim </state> <state id="s03"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout3" delay="1s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <!-- identical to test242sub1.scxml. --> diff --git a/test/w3c/lua/test243.scxml b/test/w3c/lua/test243.scxml index 03943f8..98d3de8 100644 --- a/test/w3c/lua/test243.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <param name="Var1" expr="1"/> diff --git a/test/w3c/lua/test244.scxml b/test/w3c/lua/test244.scxml index 292ebe1..be58b08 100644 --- a/test/w3c/lua/test244.scxml +++ b/test/w3c/lua/test244.scxml @@ -9,7 +9,7 @@ but should run correctly. --> </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" namelist="Var1"> <content> diff --git a/test/w3c/lua/test245.scxml b/test/w3c/lua/test245.scxml index 59da5e7..94e973f 100644 --- a/test/w3c/lua/test245.scxml +++ b/test/w3c/lua/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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/" namelist="Var2"> <content> diff --git a/test/w3c/lua/test247.scxml b/test/w3c/lua/test247.scxml index eb79081..6912e46 100644 --- a/test/w3c/lua/test247.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/lua/test250.scxml b/test/w3c/lua/test250.scxml index 0d4a094..557ab79 100644 --- a/test/w3c/lua/test250.scxml +++ b/test/w3c/lua/test250.scxml @@ -12,7 +12,7 @@ Tester must examine log output from child process to determine success --> <scxml initial="sub0" version="1.0" datamodel="lua"> <state id="sub0" initial="sub01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <transition event="timeout" target="subFinal"/> <onexit> diff --git a/test/w3c/lua/test253.scxml b/test/w3c/lua/test253.scxml index 18f9bc8..af6cea3 100644 --- a/test/w3c/lua/test253.scxml +++ b/test/w3c/lua/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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <transition event="timeout" target="fail"/> <invoke type="scxml" id="foo"> diff --git a/test/w3c/lua/test277.scxml b/test/w3c/lua/test277.scxml index bf8ecbc..00a06b4 100644 --- a/test/w3c/lua/test277.scxml +++ b/test/w3c/lua/test277.scxml @@ -3,7 +3,7 @@ we can assign to it later in state s1. --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="lua"> <datamodel> - <data id="Var1" expr="return"/> + <data id="Var1" expr="return#"/> </datamodel> <state id="s0"> <onentry> diff --git a/test/w3c/lua/test298.scxml b/test/w3c/lua/test298.scxml index 843af8c..ceb6f7d 100644 --- a/test/w3c/lua/test298.scxml +++ b/test/w3c/lua/test298.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="error.execution" target="pass"/> <transition event="*" target="fail"/> diff --git a/test/w3c/lua/test311.scxml b/test/w3c/lua/test311.scxml index ce7ebe6..1a72b59 100644 --- a/test/w3c/lua/test311.scxml +++ b/test/w3c/lua/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="lua" initial="s0"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> <assign location="foo.bar.baz " expr="1"/> </onentry> <transition event="error.execution" target="pass"/> diff --git a/test/w3c/lua/test312.scxml b/test/w3c/lua/test312.scxml index 1e20665..6dbf0e8 100644 --- a/test/w3c/lua/test312.scxml +++ b/test/w3c/lua/test312.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0"> <onentry> - <assign location="Var1" expr="return"/> + <assign location="Var1" expr="return#"/> <raise event="foo"/> </onentry> <transition event="error.execution" target="pass"/> diff --git a/test/w3c/lua/test313.scxml b/test/w3c/lua/test313.scxml index bdedda3..ee62b7e 100644 --- a/test/w3c/lua/test313.scxml +++ b/test/w3c/lua/test313.scxml @@ -7,7 +7,7 @@ expression, it must raise an error --> </datamodel> <state id="s0"> <onentry> - <assign location="Var1" expr="return"/> + <assign location="Var1" expr="return#"/> <raise event="foo"/> </onentry> <transition event="error.execution" target="pass"/> diff --git a/test/w3c/lua/test314.scxml b/test/w3c/lua/test314.scxml index ca2c283..9bf5936 100644 --- a/test/w3c/lua/test314.scxml +++ b/test/w3c/lua/test314.scxml @@ -15,7 +15,7 @@ it should not raise an error until it gets to s03 and evaluates the illegal expr </state> <state id="s03"> <onentry> - <assign location="Var1" expr="return"/> + <assign location="Var1" expr="return#"/> <raise event="foo"/> </onentry> <transition event="error.execution" target="pass"/> diff --git a/test/w3c/lua/test338.scxml b/test/w3c/lua/test338.scxml index 0031bf3..4447048 100644 --- a/test/w3c/lua/test338.scxml +++ b/test/w3c/lua/test338.scxml @@ -8,7 +8,7 @@ case where the invoke doesn't work correctly --> </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <invoke idlocation="Var1" type="http://www.w3.org/TR/scxml/"> <content> diff --git a/test/w3c/lua/test347.scxml b/test/w3c/lua/test347.scxml index 4184032..e11e6d4 100644 --- a/test/w3c/lua/test347.scxml +++ b/test/w3c/lua/test347.scxml @@ -17,7 +17,7 @@ and its parent process --> </content> </invoke> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="20000" event="timeout"/> + <send delay="20s" event="timeout"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/lua/test350.scxml b/test/w3c/lua/test350.scxml index 615347c..41eb856 100644 --- a/test/w3c/lua/test350.scxml +++ b/test/w3c/lua/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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send delay="5s" 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/lua/test351.scxml b/test/w3c/lua/test351.scxml index 783d551..15c3032 100644 --- a/test/w3c/lua/test351.scxml +++ b/test/w3c/lua/test351.scxml @@ -7,7 +7,7 @@ </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send delay="5s" 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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send delay="5s" event="timeout"/> <send event="s0Event2"/> </onentry> <transition event="s0Event2" target="s3"> diff --git a/test/w3c/lua/test352.scxml b/test/w3c/lua/test352.scxml index c503e4a..63132d2 100644 --- a/test/w3c/lua/test352.scxml +++ b/test/w3c/lua/test352.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send delay="5s" event="timeout"/> <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" event="s0Event"/> </onentry> <transition event="s0Event" target="s1"> diff --git a/test/w3c/lua/test354.scxml b/test/w3c/lua/test354.scxml index bfbdcea..a7285f4 100644 --- a/test/w3c/lua/test354.scxml +++ b/test/w3c/lua/test354.scxml @@ -9,7 +9,7 @@ and that correct values are used --> </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send delay="5s" 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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="5000" event="timeout"/> + <send delay="5s" event="timeout"/> <send event="event2"> <content>123</content> </send> diff --git a/test/w3c/lua/test364.scxml b/test/w3c/lua/test364.scxml index 4cfd36f..dfa8d88 100644 --- a/test/w3c/lua/test364.scxml +++ b/test/w3c/lua/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="lua" initial="s1" version="1.0"> <state id="s1" initial="s11p112 s11p122"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <state id="s11" initial="s111"> diff --git a/test/w3c/lua/test372.scxml b/test/w3c/lua/test372.scxml index 06228b0..b01620c 100644 --- a/test/w3c/lua/test372.scxml +++ b/test/w3c/lua/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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="done.state.s0" cond="Var1==2" target="pass"/> <transition event="*" target="fail"/> diff --git a/test/w3c/lua/test387.scxml b/test/w3c/lua/test387.scxml index 29ac764..04117df 100644 --- a/test/w3c/lua/test387.scxml +++ b/test/w3c/lua/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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition target="s0HistShallow"/> </state> diff --git a/test/w3c/lua/test388.scxml b/test/w3c/lua/test388.scxml index 253cbe2..1c4c944 100644 --- a/test/w3c/lua/test388.scxml +++ b/test/w3c/lua/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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </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/lua/test399.scxml b/test/w3c/lua/test399.scxml index 29114d3..54e536a 100644 --- a/test/w3c/lua/test399.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <!-- this will catch the failure case --> <transition event="timeout" target="fail"/> diff --git a/test/w3c/lua/test402.scxml b/test/w3c/lua/test402.scxml index 47ea7c5..65fe3f4 100644 --- a/test/w3c/lua/test402.scxml +++ b/test/w3c/lua/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 xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/lua/test403a.scxml b/test/w3c/lua/test403a.scxml index 1653c35..bdb1a9a 100644 --- a/test/w3c/lua/test403a.scxml +++ b/test/w3c/lua/test403a.scxml @@ -10,7 +10,7 @@ matching transition in the child. --> <state id="s0" initial="s01"> <onentry> <!-- catch the failure case --> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <transition event="event1" target="fail"/> diff --git a/test/w3c/lua/test403c.scxml b/test/w3c/lua/test403c.scxml index bb06c2e..9f84aa6 100644 --- a/test/w3c/lua/test403c.scxml +++ b/test/w3c/lua/test403c.scxml @@ -7,7 +7,7 @@ <state id="s0" initial="p0"> <onentry> <raise event="event1"/> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="event2" target="fail"/> <transition event="timeout" target="fail"/> diff --git a/test/w3c/lua/test405.scxml b/test/w3c/lua/test405.scxml index 6b79e52..1c7d651 100644 --- a/test/w3c/lua/test405.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0" initial="s01p"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <parallel id="s01p"> diff --git a/test/w3c/lua/test406.scxml b/test/w3c/lua/test406.scxml index c7e6b00..54ac73b 100644 --- a/test/w3c/lua/test406.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <state id="s01"> diff --git a/test/w3c/lua/test411.scxml b/test/w3c/lua/test411.scxml index 0ce82e6..37d0d9a 100644 --- a/test/w3c/lua/test411.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> <if cond="In('s01')"> <raise event="event1"/> </if> diff --git a/test/w3c/lua/test412.scxml b/test/w3c/lua/test412.scxml index 69879e8..816c844 100644 --- a/test/w3c/lua/test412.scxml +++ b/test/w3c/lua/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="lua"> <state id="s0" initial="s01"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <transition event="event1" target="fail"/> diff --git a/test/w3c/lua/test416.scxml b/test/w3c/lua/test416.scxml index a8a6ec3..18c7bf5 100644 --- a/test/w3c/lua/test416.scxml +++ b/test/w3c/lua/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="lua"> <state id="s1" initial="s11"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <state id="s11" initial="s111"> diff --git a/test/w3c/lua/test417.scxml b/test/w3c/lua/test417.scxml index 37019b0..0c0ce26 100644 --- a/test/w3c/lua/test417.scxml +++ b/test/w3c/lua/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="lua"> <state id="s1" initial="s1p1"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <parallel id="s1p1"> diff --git a/test/w3c/lua/test487.scxml b/test/w3c/lua/test487.scxml index 9360331..f532de9 100644 --- a/test/w3c/lua/test487.scxml +++ b/test/w3c/lua/test487.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0"> <onentry> - <assign location="Var1" expr="return"/> + <assign location="Var1" expr="return#"/> <raise event="event"/> </onentry> <transition event="error.execution" target="pass"/> diff --git a/test/w3c/lua/test501.scxml b/test/w3c/lua/test501.scxml index 9b579ed..4bc5094 100644 --- a/test/w3c/lua/test501.scxml +++ b/test/w3c/lua/test501.scxml @@ -7,7 +7,7 @@ <state id="s0"> <onentry> <send targetexpr="Var1" event="foo"/> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <transition event="foo" target="pass"/> <transition event="*" target="fail"/> diff --git a/test/w3c/lua/test509.scxml b/test/w3c/lua/test509.scxml index 8a328f9..f7862d2 100644 --- a/test/w3c/lua/test509.scxml +++ b/test/w3c/lua/test509.scxml @@ -4,7 +4,7 @@ at the accessURI --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="lua" version="1.0"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/> + <send event="timeout" delay="30s"/> <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/> </onentry> <!-- if the event was send by http and we get it, we succeed --> diff --git a/test/w3c/lua/test510.scxml b/test/w3c/lua/test510.scxml index 61468e2..a9c98e5 100644 --- a/test/w3c/lua/test510.scxml +++ b/test/w3c/lua/test510.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" datamodel="lua" version="1.0"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/> + <send event="timeout" delay="30s"/> <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/> <!-- this creates an internal event --> <raise event="internal"/> diff --git a/test/w3c/lua/test518.scxml b/test/w3c/lua/test518.scxml index 455015e..ce1929c 100644 --- a/test/w3c/lua/test518.scxml +++ b/test/w3c/lua/test518.scxml @@ -6,7 +6,7 @@ </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/> + <send event="timeout" delay="30s"/> <send event="test" targetexpr="_ioprocessors.basichttp.location" namelist="Var1" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/> </onentry> <transition event="test" cond="string.find(_event.raw, 'Var1=2')" target="pass"/> diff --git a/test/w3c/lua/test519.scxml b/test/w3c/lua/test519.scxml index 71f53db..81225c3 100644 --- a/test/w3c/lua/test519.scxml +++ b/test/w3c/lua/test519.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" datamodel="lua" version="1.0"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/> + <send event="timeout" delay="30s"/> <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> <param name="param1" expr="1"/> </send> diff --git a/test/w3c/lua/test520.scxml b/test/w3c/lua/test520.scxml index 8b41a4f..d9cd6cb 100644 --- a/test/w3c/lua/test520.scxml +++ b/test/w3c/lua/test520.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" datamodel="lua" version="1.0"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/> + <send event="timeout" delay="30s"/> <send targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> <content>this is some content</content> </send> diff --git a/test/w3c/lua/test520.scxml.orig b/test/w3c/lua/test520.scxml.orig new file mode 100644 index 0000000..9c91eda --- /dev/null +++ b/test/w3c/lua/test520.scxml.orig @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?><!-- test that that <content> gets sent as the body of the message. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="lua" version="1.0"> + + +<state id="s0"> + <onentry> + <send event="timeout" delay="30s"/> + <send targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> + <content>this is some content</content> + </send> + </onentry> + + <!-- if other end sends us back this event, we succeed. Test for two common + ways of encoding --> + <transition event="HTTP.POST" cond="string.find(_event.raw, 'this+is+some+content')" target="pass"/> + <transition event="HTTP.POST" cond="string.find(_event.raw, 'this%20is%20some%20content')" target="pass"/> + <transition event="*" 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/lua/test522.scxml b/test/w3c/lua/test522.scxml index 67cf475..c02ff76 100644 --- a/test/w3c/lua/test522.scxml +++ b/test/w3c/lua/test522.scxml @@ -4,7 +4,7 @@ to send a message to the processor --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="lua" version="1.0"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/> + <send event="timeout" delay="30s"/> <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location"/> </onentry> <!-- the event we receive should be called 'test', but that's not actually diff --git a/test/w3c/lua/test528.scxml b/test/w3c/lua/test528.scxml index c8fa933..37304dc 100644 --- a/test/w3c/lua/test528.scxml +++ b/test/w3c/lua/test528.scxml @@ -10,7 +10,7 @@ </state> <final id="s02"> <donedata> - <content expr="return"/> + <content expr="return#"/> </donedata> </final> </state> diff --git a/test/w3c/lua/test530.scxml b/test/w3c/lua/test530.scxml index 913e239..b52d3ce 100644 --- a/test/w3c/lua/test530.scxml +++ b/test/w3c/lua/test530.scxml @@ -13,7 +13,7 @@ is evaluated at the right time, we should get invoke.done, otherwise an error - <final/> </scxml> </assign> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2s" event="timeout"/> + <send event="timeout" delay="2s"/> </onentry> <invoke type="http://www.w3.org/TR/scxml/"> <content expr="Var1"/> diff --git a/test/w3c/lua/test531.scxml b/test/w3c/lua/test531.scxml index 72be9fe..42ffea8 100644 --- a/test/w3c/lua/test531.scxml +++ b/test/w3c/lua/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="lua" version="1.0"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> <send targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> <param name="_scxmleventname" expr="'test'"/> </send> diff --git a/test/w3c/lua/test532.scxml b/test/w3c/lua/test532.scxml index 6c3275f..4efe309 100644 --- a/test/w3c/lua/test532.scxml +++ b/test/w3c/lua/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="lua" version="1.0"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> <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/lua/test534.scxml b/test/w3c/lua/test534.scxml index 1826196..c517471 100644 --- a/test/w3c/lua/test534.scxml +++ b/test/w3c/lua/test534.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" datamodel="lua" version="1.0"> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/> + <send event="timeout" delay="30s"/> <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> </send> </onentry> diff --git a/test/w3c/lua/test562.scxml b/test/w3c/lua/test562.scxml index fc73973..dc0450b 100644 --- a/test/w3c/lua/test562.scxml +++ b/test/w3c/lua/test562.scxml @@ -1,25 +1,27 @@ -<?xml version="1.0" encoding="UTF-8"?> -<scxml datamodel="lua" initial="s0" name="ScxmlShape1" version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance"> - <state id="s0"> - <onentry> - <send event="foo"> - <content> +<?xml version="1.0" encoding="UTF-8"?> +<!-- in the ECMA data model, test that processor creates space normalized string in + _event.data when receiving anything other than KVPs or XML in an event --> +<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="lua"> + <state id="s0"> + <onentry> + <send event="foo"> + <content> this is a string - </content> - </send> - </onentry> - <transition cond="_event.data == 'this is a string'" event="foo" target="pass"/> - <transition event="*" target="fail"/> - </state> - <final id="pass"> - <onentry> - <log expr="'pass'" label="Outcome"/> - </onentry> - </final> - <final id="fail"> - <onentry> - <log expr="'fail'" label="Outcome"/> - </onentry> - </final> -</scxml>
\ No newline at end of file +</content> + </send> + </onentry> + <transition event="foo" cond="_event.data == 'this is a string'" target="pass"/> + <transition event="*" 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> diff --git a/test/w3c/lua/test567.scxml b/test/w3c/lua/test567.scxml index 39ec814..aa27c9c 100644 --- a/test/w3c/lua/test567.scxml +++ b/test/w3c/lua/test567.scxml @@ -7,7 +7,7 @@ _event.data. --> </datamodel> <state id="s0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="3000" event="timeout"/> + <send event="timeout" delay="3s"/> <!-- 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/lua/test567.scxml.old b/test/w3c/lua/test567.scxml.old deleted file mode 100644 index 14c0102..0000000 --- a/test/w3c/lua/test567.scxml.old +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- test that that any content in the message other than _scxmleventname is used to populate -_event.data. --> -<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="lua" version="1.0"> - <datamodel> - <data id="Var1" expr="2"/> - </datamodel> - <state id="s0"> - <onentry> - <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"> - <param name="param1" expr="2"/> - </send> - </onentry> - <!-- if we get this event, we succeed --> - <transition event="test" target="s1"> - <assign location="Var1" expr="_event.data.param1"/> - </transition> - <transition event="*" target="fail"/> - </state> - <state id="s1"> - <transition cond="Var1==2" target="pass"/> - <transition 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> diff --git a/test/w3c/lua/test570.scxml b/test/w3c/lua/test570.scxml index 4afa649..963b0e5 100644 --- a/test/w3c/lua/test570.scxml +++ b/test/w3c/lua/test570.scxml @@ -6,7 +6,7 @@ </datamodel> <parallel id="p0"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send event="timeout" delay="2s"/> <raise event="e1"/> <raise event="e2"/> </onentry> diff --git a/test/w3c/lua/test576.scxml b/test/w3c/lua/test576.scxml index b0c0494..d65a386 100644 --- a/test/w3c/lua/test576.scxml +++ b/test/w3c/lua/test576.scxml @@ -7,7 +7,7 @@ test that both are entered. --> </state> <state id="s1"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="1000" event="timeout"/> + <send event="timeout" delay="1s"/> </onentry> <transition event="timeout" target="fail"/> <state id="s11" initial="s111"> diff --git a/test/w3c/lua/test580.scxml b/test/w3c/lua/test580.scxml index 229e3cf..9a025a0 100644 --- a/test/w3c/lua/test580.scxml +++ b/test/w3c/lua/test580.scxml @@ -6,7 +6,7 @@ </datamodel> <parallel id="p1"> <onentry> - <send xmlns:scxml="http://www.w3.org/2005/07/scxml" delay="2000" event="timeout"/> + <send delay="2s" event="timeout"/> </onentry> <state id="s0"> <transition cond="In('sh1')" target="fail"/> |