diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-02-20 21:13:02 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-02-20 21:13:02 (GMT) |
| commit | a56f28b0db56ff3e39f0b50e4c55c52b7aeec696 (patch) | |
| tree | 41cf67ea5cee9593e86272ab55367653fbd1c2f3 /test | |
| parent | 7c779099b3acd1fa969dde718299484ebe0d2775 (diff) | |
| download | uscxml-a56f28b0db56ff3e39f0b50e4c55c52b7aeec696.zip uscxml-a56f28b0db56ff3e39f0b50e4c55c52b7aeec696.tar.gz uscxml-a56f28b0db56ff3e39f0b50e4c55c52b7aeec696.tar.bz2 | |
See detailled log
- Builds on windows again
- All HTTP requests are no passed into interpreter
- New response element to reply with data
- Moved basichttp URL
- New HTTP servlet invoker to register additional URLs
- More bugfixes than I care to mention
Diffstat (limited to 'test')
263 files changed, 4325 insertions, 4344 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 88d10e9..b6cbdc0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,36 +1,25 @@ -find_program(XMLLINT xmllint) -if (XMLLINT) - file(GLOB SCXML_FILES samples/uscxml/*.scxml) - -endif() - -add_executable(test-predicates src/test-predicates.cpp) -target_link_libraries(test-predicates uscxml) -add_test(test-predicates ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-predicates ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-predicates.scxml) -set_target_properties(test-predicates PROPERTIES FOLDER "Tests") +# find_program(XMLLINT xmllint) +# if (XMLLINT) +# file(GLOB SCXML_FILES samples/uscxml/*.scxml) +# endif() -add_executable(test-execution src/test-execution.cpp) -target_link_libraries(test-execution uscxml) -add_test(test-execution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-execution ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-execution.scxml) -set_target_properties(test-execution PROPERTIES FOLDER "Tests") +if (NOT WIN32) + add_executable(test-predicates src/test-predicates.cpp) + target_link_libraries(test-predicates uscxml) + add_test(test-predicates ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-predicates ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-predicates.scxml) + set_target_properties(test-predicates PROPERTIES FOLDER "Tests") +endif() -# add_executable(test-apache-commons src/test-apache-commons.cpp) -# target_link_libraries(test-apache-commons uscxml) -# add_test(test-apache-commons ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-apache-commons ${CMAKE_SOURCE_DIR}/test/samples/apache) -# set_target_properties(test-apache-commons PROPERTIES FOLDER "Tests") - -# if (V8_FOUND) -# add_executable(test-ecmascript-v8 src/test-ecmascript-v8.cpp) -# target_link_libraries(test-ecmascript-v8 uscxml) -# add_test(test-ecmascript-v8 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-ecmascript-v8 ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-ecmascript.scxml) -# set_target_properties(test-ecmascript-v8 PROPERTIES FOLDER "Tests") -# endif() +add_test(test-execution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-execution.scxml) +add_test(test-communication ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-communication.scxml) +add_test(test-done-data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-donedata.scxml) if (SWI_FOUND) - add_executable(test-prolog-swi src/test-prolog-swi.cpp) - target_link_libraries(test-prolog-swi uscxml) - add_test(test-prolog-swi ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-prolog-swi ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-prolog.scxml) - set_target_properties(test-prolog-swi PROPERTIES FOLDER "Tests") + add_test(test-prolog-swi ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-prolog.scxml) +endif() + +if (V8_FOUND) + add_test(test-ecmascript ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mmi-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-ecmascript.scxml) endif() if (OPENSCENEGRAPH_FOUND) @@ -39,21 +28,11 @@ if (OPENSCENEGRAPH_FOUND) set_target_properties(test-osg PROPERTIES FOLDER "Tests") endif() -add_executable(test-communication src/test-communication.cpp) -target_link_libraries(test-communication uscxml) -add_test(test-communication ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-communication ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-communication.scxml) -set_target_properties(test-communication PROPERTIES FOLDER "Tests") - add_executable(test-eventdelay src/test-eventdelay.cpp) target_link_libraries(test-eventdelay uscxml) add_test(test-eventdelay ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-eventdelay) set_target_properties(test-eventdelay PROPERTIES FOLDER "Tests") -add_executable(test-completion src/test-completion.cpp) -target_link_libraries(test-completion uscxml) -add_test(test-completion ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-completion ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-donedata.scxml) -set_target_properties(test-completion PROPERTIES FOLDER "Tests") - if (NOT WIN32) add_executable(test-arabica-events src/test-arabica-events.cpp) target_link_libraries(test-arabica-events uscxml) @@ -67,8 +46,11 @@ add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-url) set_target_properties(test-url PROPERTIES FOLDER "Tests") add_executable(scxml-test-framework-client - ${PROJECT_SOURCE_DIR}/contrib/src/jsmn/jsmn.c src/scxml-test-framework-client.cpp) -target_link_libraries(scxml-test-framework-client uscxml) + target_link_libraries(scxml-test-framework-client uscxml) set_target_properties(scxml-test-framework-client PROPERTIES FOLDER "Tests") +# add_executable(test-curl-multi-api src/test-curl-multi-api.cpp) +# target_link_libraries(test-curl-multi-api uscxml) +# add_test(test-curl-multi-api ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-completion) +# set_target_properties(test-curl-multi-api PROPERTIES FOLDER "Tests") diff --git a/test/run-scxml-test-framework.sh b/test/run-scxml-test-framework.sh index e20afe9..83cb403 100755 --- a/test/run-scxml-test-framework.sh +++ b/test/run-scxml-test-framework.sh @@ -100,7 +100,7 @@ TESTS="" # TESTS="${TESTS} scxml-test-framework/test/multiple-events-per-transition/test1.scxml" # passed # TESTS="${TESTS} scxml-test-framework/test/parallel/test0.scxml" # passed -# TESTS="${TESTS} scxml-test-framework/test/parallel/test1.scxml" # passed +# TESTS="${TESTS} scxml-test-framework/test/parallel/test1.scxml" # failed # TESTS="${TESTS} scxml-test-framework/test/parallel/test2.scxml" # passed # TESTS="${TESTS} scxml-test-framework/test/parallel/test3.scxml" # passed @@ -142,7 +142,7 @@ TESTS="" # TESTS="${TESTS} scxml-test-framework/test/script/test2.scxml" # getData not defined # TESTS="${TESTS} scxml-test-framework/test/script-src/test0.scxml" # getData not defined # TESTS="${TESTS} scxml-test-framework/test/script-src/test1.scxml" # getData not defined -# TESTS="${TESTS} scxml-test-framework/test/script-src/test2.scxml" # getData not defined +#TESTS="${TESTS} scxml-test-framework/test/script-src/test2.scxml" # getData not defined # TESTS="${TESTS} scxml-test-framework/test/script-src/test3.scxml" # getData not defined # TESTS="${TESTS} scxml-test-framework/test/scxml-prefix-event-name-matching/star0.scxml" # passed @@ -155,8 +155,9 @@ TESTS="" # TESTS="${TESTS} scxml-test-framework/test/targetless-transition/test0.scxml" # passed # TESTS="${TESTS} scxml-test-framework/test/targetless-transition/test1.scxml" # passed # TESTS="${TESTS} scxml-test-framework/test/targetless-transition/test2.scxml" # passed -TESTS="${TESTS} scxml-test-framework/test/targetless-transition/test3.scxml" # failed +# TESTS="${TESTS} scxml-test-framework/test/targetless-transition/test3.scxml" # failed +TESTS="${TESTS} scxml-test-framework/test/*/*.scxml" #trap 'killall ${SCXML_TEST_FRAMEWORK_NAME}' 0 #$SCXML_TEST_FRAMEWORK_FULL & diff --git a/test/samples/uscxml/test-custom-executable-content.scxml b/test/samples/uscxml/test-custom-executable-content.scxml new file mode 100644 index 0000000..a40af93 --- /dev/null +++ b/test/samples/uscxml/test-custom-executable-content.scxml @@ -0,0 +1,19 @@ +<scxml datamodel="ecmascript"> + <script src="http://uscxml.tk.informatik.tu-darmstadt.de/scripts/dump.js" /> + <state id="start"> + <onentry> + <fetch + target="http://data.wien.gv.at/daten/wfs?service=WFS&request=GetFeature&version=1.1.0&typeName=ogdwien:BAUMOGD&srsName=EPSG:4326&outputFormat=json&maxfeatures=5" + callback="data.wien" + type="json" /> + </onentry> + <state id="wait"> + <transition event="data.wien" target="final"> + <script> + dump(_event); + </script> + </transition> + </state> + </state> + <final id="final" /> +</scxml>
\ No newline at end of file diff --git a/test/samples/uscxml/test-ecmascript.scxml b/test/samples/uscxml/test-ecmascript.scxml index aa88f17..7dfd94c 100644 --- a/test/samples/uscxml/test-ecmascript.scxml +++ b/test/samples/uscxml/test-ecmascript.scxml @@ -77,13 +77,7 @@ </foreach> </foreach> </onentry> - <transition target="externalEvents" /> - </state> - <state id="externalEvents"> - <onentry> - <log expr="'-- External Events'" /> - </onentry> - <transition target="datamodels" event="event1" cond="_event.name == 'event1'" /> + <transition target="datamodels" /> </state> <state id="datamodels"> <datamodel> diff --git a/test/samples/uscxml/test-http-servlet.scxml b/test/samples/uscxml/test-http-servlet.scxml new file mode 100644 index 0000000..8836b76 --- /dev/null +++ b/test/samples/uscxml/test-http-servlet.scxml @@ -0,0 +1,41 @@ +<scxml datamodel="ecmascript"> + <script src="http://uscxml.tk.informatik.tu-darmstadt.de/scripts/dump.js" /> + <state id="start"> + <!-- + I went for explicit invokers instead of a response element in executable content + as it provides better control on the path where to serve data. + --> + <invoke type="httpserver" id="servlet.data"> + <!-- server path where to listen --> + <param name="path" expr="'data'" /> + <!-- the name of events originating from requests at this url --> + <param name="callback" expr="'http.data'" /> + </invoke> + <invoke type="httpserver" id="servlet.exit"> + <param name="path" expr="'exit'" /> + <param name="callback" expr="'http.exit'" /> + </invoke> + <state id="loop"> + <transition event="http.data" target="loop"> + <script> + dump(_event); + </script> + <!-- Sending a http reply is to send the invoker id a "reply.<requestId>" event --> + <send target="#_servlet.data" eventexpr="'reply.' + _event.data.reqId"> + <!-- This will end up as a header field --> + <param name="Foo" expr="_ioprocessors" /> + <!-- JSON string in the content --> + <content expr="_ioprocessors" /> + </send> + </transition> + <transition event="http.exit" target="final"> + <script> + dump(_event); + </script> + <!-- This will never get delivered as we terminate before --> + <send target="#_servlet.exit" eventexpr="'reply.' + _event.data.reqId" /> + </transition> + </state> + </state> + <final id="final" /> +</scxml>
\ No newline at end of file diff --git a/test/samples/uscxml/test-response-element.scxml b/test/samples/uscxml/test-response-element.scxml new file mode 100644 index 0000000..d3d3c53 --- /dev/null +++ b/test/samples/uscxml/test-response-element.scxml @@ -0,0 +1,14 @@ +<scxml datamodel="ecmascript" name="test"> + <script src="http://uscxml.tk.informatik.tu-darmstadt.de/scripts/dump.js" /> + <state id="start"> + <state id="loop"> + <transition event="http" target="loop"> + <!-- script> + dump(_event); + </script --> + <response status="200" requestexpr="_event.origin" /> + </transition> + </state> + </state> + <final id="final" /> +</scxml>
\ No newline at end of file diff --git a/test/scxml-test-framework/test-ext/node/require/require.json b/test/scxml-test-framework/test-ext/node/require/require.json deleted file mode 100644 index 1d2faec..0000000 --- a/test/scxml-test-framework/test-ext/node/require/require.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] -} - - - diff --git a/test/scxml-test-framework/test-ext/node/require/require.scxml b/test/scxml-test-framework/test-ext/node/require/require.scxml deleted file mode 100644 index 221ad81..0000000 --- a/test/scxml-test-framework/test-ext/node/require/require.scxml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2011-2012 Jacob Beard, INFICON, and other SCION contributors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <datamodel> - <data id="util"/> - <data id="submodule1"/> - <data id="submodule2"/> - <data id="submodule3"/> - <data id="submodule4"/> - </datamodel> - - <script> - util = require('util'); //require built-in module - console.log('hello'); - submodule1 = require('./submodule1'); - </script> - - <script src="script2.js"/> - - <state id="a"> - <onentry> - <script> - submodule3 = require('./submodule3'); - </script> - <script src="script4.js"/> - <log label="util" expr="util"/> - <log label="submodules" expr="[submodule1, submodule2, submodule3, submodule4]"/> - </onentry> - - <transition event="t" target="b" cond="util && submodule1 && submodule2 && submodule3 && submodule4"/> - <transition event="t" target="f"/> - </state> - - <state id="b"/> - <state id="f"/> - -</scxml> diff --git a/test/scxml-test-framework/test-ext/node/require/script2.js b/test/scxml-test-framework/test-ext/node/require/script2.js deleted file mode 100644 index 25259e7..0000000 --- a/test/scxml-test-framework/test-ext/node/require/script2.js +++ /dev/null @@ -1 +0,0 @@ -submodule2 = require('./submodule2'); diff --git a/test/scxml-test-framework/test-ext/node/require/script3.js b/test/scxml-test-framework/test-ext/node/require/script3.js deleted file mode 100644 index 76a37e1..0000000 --- a/test/scxml-test-framework/test-ext/node/require/script3.js +++ /dev/null @@ -1 +0,0 @@ -submodule3 = require('./submodule3'); diff --git a/test/scxml-test-framework/test-ext/node/require/script4.js b/test/scxml-test-framework/test-ext/node/require/script4.js deleted file mode 100644 index 348b8c9..0000000 --- a/test/scxml-test-framework/test-ext/node/require/script4.js +++ /dev/null @@ -1 +0,0 @@ -submodule4 = require('./submodule4'); diff --git a/test/scxml-test-framework/test-ext/node/require/submodule1.js b/test/scxml-test-framework/test-ext/node/require/submodule1.js deleted file mode 100644 index bd816ea..0000000 --- a/test/scxml-test-framework/test-ext/node/require/submodule1.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = 1; diff --git a/test/scxml-test-framework/test-ext/node/require/submodule2.js b/test/scxml-test-framework/test-ext/node/require/submodule2.js deleted file mode 100644 index 4bbffde..0000000 --- a/test/scxml-test-framework/test-ext/node/require/submodule2.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = 2; diff --git a/test/scxml-test-framework/test-ext/node/require/submodule3.js b/test/scxml-test-framework/test-ext/node/require/submodule3.js deleted file mode 100644 index 690aad3..0000000 --- a/test/scxml-test-framework/test-ext/node/require/submodule3.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = 3; diff --git a/test/scxml-test-framework/test-ext/node/require/submodule4.js b/test/scxml-test-framework/test-ext/node/require/submodule4.js deleted file mode 100644 index a9bbdd8..0000000 --- a/test/scxml-test-framework/test-ext/node/require/submodule4.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = 4; diff --git a/test/scxml-test-framework/test-ext/node/runner.js b/test/scxml-test-framework/test-ext/node/runner.js deleted file mode 100644 index da68716..0000000 --- a/test/scxml-test-framework/test-ext/node/runner.js +++ /dev/null @@ -1,11 +0,0 @@ -var scion = require('scion'); - -scion.pathToModel('require/require.scxml',function(err,model){ - if(err) throw err; - - var scxml = new scion.SCXML(model); - var initialConfig = scxml.start(); - console.log("initialConfig",initialConfig); - var nextConfig = scxml.gen("t"); - console.log("nextConfig",nextConfig); -}); diff --git a/test/scxml-test-framework/test/actionSend/send1.json b/test/scxml-test-framework/test/actionSend/send1.json index 8424ef5..0e49c49 100644 --- a/test/scxml-test-framework/test/actionSend/send1.json +++ b/test/scxml-test-framework/test/actionSend/send1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/actionSend/send1.scxml b/test/scxml-test-framework/test/actionSend/send1.scxml index dcccc56..5c62852 100644 --- a/test/scxml-test-framework/test/actionSend/send1.scxml +++ b/test/scxml-test-framework/test/actionSend/send1.scxml @@ -15,27 +15,23 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - datamodel="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - <raise event="s"/> - </transition> - </state> - - <state id="b"> - <transition target="c" event="s"/> - </state> - - <state id="c"> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + initial="a" + version="1.0"> + + <state id="a"> + <transition target="b" event="t"> + <raise event="s"/> + </transition> + </state> + + <state id="b"> + <transition target="c" event="s"/> + </state> + + <state id="c"> + </state> </scxml> diff --git a/test/scxml-test-framework/test/actionSend/send2.json b/test/scxml-test-framework/test/actionSend/send2.json index 8a11f79..6831c27 100644 --- a/test/scxml-test-framework/test/actionSend/send2.json +++ b/test/scxml-test-framework/test/actionSend/send2.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/actionSend/send2.scxml b/test/scxml-test-framework/test/actionSend/send2.scxml index 8fcb593..6eb8dda 100644 --- a/test/scxml-test-framework/test/actionSend/send2.scxml +++ b/test/scxml-test-framework/test/actionSend/send2.scxml @@ -15,30 +15,26 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <onexit> - <raise event="s"/> - </onexit> - - <transition target="b" event="t"> - </transition> - </state> - - <state id="b"> - <transition target="c" event="s"/> - </state> - - <state id="c"> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + initial="a" + version="1.0"> + + <state id="a"> + <onexit> + <raise event="s"/> + </onexit> + + <transition target="b" event="t"> + </transition> + </state> + + <state id="b"> + <transition target="c" event="s"/> + </state> + + <state id="c"> + </state> </scxml> diff --git a/test/scxml-test-framework/test/actionSend/send3.json b/test/scxml-test-framework/test/actionSend/send3.json index 7a67a87..a61d05d 100644 --- a/test/scxml-test-framework/test/actionSend/send3.json +++ b/test/scxml-test-framework/test/actionSend/send3.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/actionSend/send3.scxml b/test/scxml-test-framework/test/actionSend/send3.scxml index 1a224ac..c7237cf 100644 --- a/test/scxml-test-framework/test/actionSend/send3.scxml +++ b/test/scxml-test-framework/test/actionSend/send3.scxml @@ -15,30 +15,26 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - </transition> - </state> - - <state id="b"> - <onentry> - <raise event="s"/> - </onentry> - - <transition target="c" event="s"/> - </state> - - <state id="c"> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + initial="a" + version="1.0"> + + <state id="a"> + <transition target="b" event="t"> + </transition> + </state> + + <state id="b"> + <onentry> + <raise event="s"/> + </onentry> + + <transition target="c" event="s"/> + </state> + + <state id="c"> + </state> </scxml> diff --git a/test/scxml-test-framework/test/actionSend/send4.json b/test/scxml-test-framework/test/actionSend/send4.json index d994bfe..f5f76a3 100644 --- a/test/scxml-test-framework/test/actionSend/send4.json +++ b/test/scxml-test-framework/test/actionSend/send4.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["d"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["d"] + } + ] } diff --git a/test/scxml-test-framework/test/actionSend/send4.scxml b/test/scxml-test-framework/test/actionSend/send4.scxml index 473355b..77ede37 100644 --- a/test/scxml-test-framework/test/actionSend/send4.scxml +++ b/test/scxml-test-framework/test/actionSend/send4.scxml @@ -18,41 +18,37 @@ This is a test to illustrate the event lifeline. In c, event "s" should no longer be in the event queue, as we are using Next Small Step semantics, so we should end up in d. This would not be true if we were using Remainder semantics. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - </transition> - </state> - - <state id="b"> - <onentry> - <raise event="s"/> - </onentry> - - <transition target="c" event="s"/> - <transition target="f1"/> - </state> - - <state id="c"> - <transition target="f2" event="s"/> - <transition target="d"/> - </state> - - <state id="f1"> - </state> - - <state id="d"> - </state> - - <state id="f2"> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + initial="a" + version="1.0"> + + <state id="a"> + <transition target="b" event="t"> + </transition> + </state> + + <state id="b"> + <onentry> + <raise event="s"/> + </onentry> + + <transition target="c" event="s"/> + <transition target="f1"/> + </state> + + <state id="c"> + <transition target="f2" event="s"/> + <transition target="d"/> + </state> + + <state id="f1"> + </state> + + <state id="d"> + </state> + + <state id="f2"> + </state> </scxml> diff --git a/test/scxml-test-framework/test/actionSend/send5.json b/test/scxml-test-framework/test/actionSend/send5.json index c749e69..60a56b6 100644 --- a/test/scxml-test-framework/test/actionSend/send5.json +++ b/test/scxml-test-framework/test/actionSend/send5.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["d"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["d"] + } + ] } diff --git a/test/scxml-test-framework/test/actionSend/send5.scxml b/test/scxml-test-framework/test/actionSend/send5.scxml index 47a9906..9e8a450 100644 --- a/test/scxml-test-framework/test/actionSend/send5.scxml +++ b/test/scxml-test-framework/test/actionSend/send5.scxml @@ -18,43 +18,39 @@ This is a test to illustrate the event lifeline, and how multiple events are handled. The whole set of triggered events will be dequeued from the inner event queue in the next small step. This is different from scxml, where only one event will be dequeued at a time in the next small step. So, SCXML semantics would lead to f2, whereas our semantics would lead to d. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - </transition> - </state> - - <state id="b"> - <onentry> - <raise event="s"/> - <raise event="r"/> - </onentry> - - <transition target="c" event="s"/> - <transition target="f1"/> - </state> - - <state id="c"> - <transition target="f2" event="r"/> - <transition target="d"/> - </state> - - <state id="f1"> - </state> - - <state id="d"> - </state> - - <state id="f2"> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + initial="a" + version="1.0"> + + <state id="a"> + <transition target="b" event="t"> + </transition> + </state> + + <state id="b"> + <onentry> + <raise event="s"/> + <raise event="r"/> + </onentry> + + <transition target="c" event="s"/> + <transition target="f1"/> + </state> + + <state id="c"> + <transition target="f2" event="r"/> + <transition target="d"/> + </state> + + <state id="f1"> + </state> + + <state id="d"> + </state> + + <state id="f2"> + </state> </scxml> diff --git a/test/scxml-test-framework/test/actionSend/send6.json b/test/scxml-test-framework/test/actionSend/send6.json index 41b718a..abb5069 100644 --- a/test/scxml-test-framework/test/actionSend/send6.json +++ b/test/scxml-test-framework/test/actionSend/send6.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["d"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["d"] + } + ] } diff --git a/test/scxml-test-framework/test/actionSend/send6.scxml b/test/scxml-test-framework/test/actionSend/send6.scxml index ac2f3ad..bb77351 100644 --- a/test/scxml-test-framework/test/actionSend/send6.scxml +++ b/test/scxml-test-framework/test/actionSend/send6.scxml @@ -15,46 +15,42 @@ limitations under the License. --> <!-- - This is a quick followup to send5.json, to show that order in the event set does not matter. Transitions with events r and s are switched. + This is a quick followup to send5.json, to show that order in the event set does not matter. Transitions with events r and s are switched. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - </transition> - </state> - - <state id="b"> - <onentry> - <raise event="s"/> - <raise event="r"/> - </onentry> - - <transition target="c" event="r"/> - <transition target="f1"/> - </state> - - <state id="c"> - <transition target="f2" event="s"/> - <transition target="d"/> - </state> - - <state id="f1"> - </state> - - <state id="d"> - </state> - - <state id="f2"> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + initial="a" + version="1.0" > + + <state id="a"> + <transition target="b" event="t"> + </transition> + </state> + + <state id="b"> + <onentry> + <raise event="s"/> + <raise event="r"/> + </onentry> + + <transition target="c" event="r"/> + <transition target="f1"/> + </state> + + <state id="c"> + <transition target="f2" event="s"/> + <transition target="d"/> + </state> + + <state id="f1"> + </state> + + <state id="d"> + </state> + + <state id="f2"> + </state> </scxml> diff --git a/test/scxml-test-framework/test/actionSend/send7.json b/test/scxml-test-framework/test/actionSend/send7.json index 92bc2ef..7e334b0 100644 --- a/test/scxml-test-framework/test/actionSend/send7.json +++ b/test/scxml-test-framework/test/actionSend/send7.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b3"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b3"] + } + ] } diff --git a/test/scxml-test-framework/test/actionSend/send7.scxml b/test/scxml-test-framework/test/actionSend/send7.scxml index a8bc512..5e7dffd 100644 --- a/test/scxml-test-framework/test/actionSend/send7.scxml +++ b/test/scxml-test-framework/test/actionSend/send7.scxml @@ -15,36 +15,32 @@ limitations under the License. --> <!-- - Illustrates one of the edge cases of these semantics. Because initial transition will be taken in its own small step, triggered event "s" will be "lost" - not availble in the next small step from b1. Will therefore end up in b3. + Illustrates one of the edge cases of these semantics. Because initial transition will be taken in its own small step, triggered event "s" will be "lost" - not availble in the next small step from b1. Will therefore end up in b3. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - <raise event="s"/> - </transition> - </state> - - <state id="b" initial="b1"> - <state id="b1"> - <transition event="s" target="b2"/> - <transition target="b3"/> - </state> - - <state id="b2"> - </state> - - <state id="b3"> - </state> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + initial="a" + version="1.0"> + + <state id="a"> + <transition target="b" event="t"> + <raise event="s"/> + </transition> + </state> + + <state id="b" initial="b1"> + <state id="b1"> + <transition event="s" target="b2"/> + <transition target="b3"/> + </state> + + <state id="b2"> + </state> + + <state id="b3"> + </state> + </state> </scxml> diff --git a/test/scxml-test-framework/test/actionSend/send8.json b/test/scxml-test-framework/test/actionSend/send8.json index b7da171..8b988bf 100644 --- a/test/scxml-test-framework/test/actionSend/send8.json +++ b/test/scxml-test-framework/test/actionSend/send8.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b2"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b2"] + } + ] } diff --git a/test/scxml-test-framework/test/actionSend/send8.scxml b/test/scxml-test-framework/test/actionSend/send8.scxml index 164e046..2484433 100644 --- a/test/scxml-test-framework/test/actionSend/send8.scxml +++ b/test/scxml-test-framework/test/actionSend/send8.scxml @@ -15,36 +15,32 @@ limitations under the License. --> <!-- - Illustrates one of the edge cases of these semantics. Followup to send7. If we target, not the outer composite state, but the inner state directly, the event will be available in the next small step. This is an example of the way in which these semantics break the synchrony hypthosesis. + Illustrates one of the edge cases of these semantics. Followup to send7. If we target, not the outer composite state, but the inner state directly, the event will be available in the next small step. This is an example of the way in which these semantics break the synchrony hypthosesis. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b1" event="t"> - <raise event="s"/> - </transition> - </state> - - <state id="b" initial="b1"> - <state id="b1"> - <transition event="s" target="b2"/> - <transition target="b3"/> - </state> - - <state id="b2"> - </state> - - <state id="b3"> - </state> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + initial="a" + version="1.0"> + + <state id="a"> + <transition target="b1" event="t"> + <raise event="s"/> + </transition> + </state> + + <state id="b" initial="b1"> + <state id="b1"> + <transition event="s" target="b2"/> + <transition target="b3"/> + </state> + + <state id="b2"> + </state> + + <state id="b3"> + </state> + </state> </scxml> diff --git a/test/scxml-test-framework/test/assign-current-small-step/test0.json b/test/scxml-test-framework/test/assign-current-small-step/test0.json index 8424ef5..0e49c49 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test0.json +++ b/test/scxml-test-framework/test/assign-current-small-step/test0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/assign-current-small-step/test0.scxml b/test/scxml-test-framework/test/assign-current-small-step/test0.scxml index 63f2f74..12131d8 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test0.scxml +++ b/test/scxml-test-framework/test/assign-current-small-step/test0.scxml @@ -15,47 +15,42 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <datamodel> - <data id="a"/> - </datamodel> + <datamodel> + <data id="x"/> + </datamodel> - <state id="a"> - <onentry> - <!-- first -1 will be assigned to the datamodel. then, in the same small-step, this will be overridden by the 99 --> - <assign location="a" expr="-1"/> - <assign location="a" expr="99"/> - </onentry> + <state id="a"> + <onentry> + <!-- first -1 will be assigned to the datamodel. then, in the same small-step, this will be overridden by the 99 --> + <assign location="x" expr="-1"/> + <assign location="x" expr="99"/> + </onentry> - <!-- in order for this transition to be taken, a must be updated immediately, in the same small-step --> - <transition event="t" target="b" cond="a === 99"> - <assign location="a" expr="a + 1"/> - </transition> - </state> + <!-- in order for this transition to be taken, a must be updated immediately, in the same small-step --> + <transition event="t" target="b" cond="x === 99"> + <assign location="x" expr="x + 1"/> + </transition> + </state> - <state id="b"> - <!-- use regular assignment syntax, assuming datamodel variables are in script scope --> - <onentry> - <script> - a *= 2; - </script> - </onentry> + <state id="b"> + <!-- use regular assignment syntax, assuming datamodel variables are in script scope --> + <onentry> + <script> + x *= 2; + </script> + </onentry> - <transition target="c" cond="a === 200"/> - <transition target="f"/> - </state> + <transition target="c" cond="x === 200"/> + <transition target="f"/> + </state> - <state id="c"/> + <state id="c"/> - <state id="f"/> + <state id="f"/> </scxml> - - - - diff --git a/test/scxml-test-framework/test/assign-current-small-step/test1.json b/test/scxml-test-framework/test/assign-current-small-step/test1.json index 8424ef5..0e49c49 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test1.json +++ b/test/scxml-test-framework/test/assign-current-small-step/test1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/assign-current-small-step/test1.scxml b/test/scxml-test-framework/test/assign-current-small-step/test1.scxml index 632d1f0..21e8777 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test1.scxml +++ b/test/scxml-test-framework/test/assign-current-small-step/test1.scxml @@ -18,32 +18,27 @@ This test illustrates how possibly infinite loops may be created. Here, without the counter and the cond, the big-step would never complete. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <datamodel> - <data id="i"/> - </datamodel> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - <assign location="i" expr="0"/> - </transition> - </state> - - <state id="b"> - <transition target="b" cond="i < 100"> - <assign location="i" expr="i + 1"/> - </transition> - <transition target="c" cond="i === 100"/> - </state> - - <state id="c"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="i"/> + </datamodel> + + <state id="a"> + <transition target="b" event="t"> + <assign location="i" expr="0"/> + </transition> + </state> + + <state id="b"> + <transition target="b" cond="i < 100"> + <assign location="i" expr="i + 1"/> + </transition> + <transition target="c" cond="i === 100"/> + </state> + + <state id="c"/> </scxml> diff --git a/test/scxml-test-framework/test/assign-current-small-step/test2.json b/test/scxml-test-framework/test/assign-current-small-step/test2.json index 6769dfe..36628bc 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test2.json +++ b/test/scxml-test-framework/test/assign-current-small-step/test2.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["e"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["e"] + } + ] } diff --git a/test/scxml-test-framework/test/assign-current-small-step/test2.scxml b/test/scxml-test-framework/test/assign-current-small-step/test2.scxml index b5a5828..05cf13b 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test2.scxml +++ b/test/scxml-test-framework/test/assign-current-small-step/test2.scxml @@ -18,53 +18,48 @@ This is another test that illustrates how possibly infinite loops may be created. Here, without the counter and the cond, the big-step would never complete. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <datamodel> - <data id="i"/> - </datamodel> + <datamodel> + <data id="i"/> + </datamodel> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <transition target="b" event="t"> + <assign location="i" expr="0"/> + </transition> + </state> - <state id="a"> - <transition target="b" event="t"> - <assign location="i" expr="0"/> - </transition> - </state> + <state id="A"> - <state id="A"> + <state id="b"> + <transition target="c" cond="i < 100"> + <assign location="i" expr="i + 1"/> + </transition> + </state> - <state id="b"> - <transition target="c" cond="i < 100"> - <assign location="i" expr="i + 1"/> - </transition> - </state> + <state id="c"> + <transition target="b" cond="i < 100"> + <assign location="i" expr="i + 1"/> + </transition> + </state> - <state id="c"> - <transition target="b" cond="i < 100"> - <assign location="i" expr="i + 1"/> - </transition> - </state> + <transition target="d" cond="i === 100"> + <assign location="i" expr="i * 2"/> + </transition> + </state> - <transition target="d" cond="i === 100"> - <assign location="i" expr="i * 2"/> - </transition> - </state> + <state id="d"> + <transition target="e" cond="i === 200"/> + <transition target="f"/> + </state> - <state id="d"> - <transition target="e" cond="i === 200"/> - <transition target="f"/> - </state> + <state id="e"/> - <state id="e"/> - - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/assign-current-small-step/test3.json b/test/scxml-test-framework/test/assign-current-small-step/test3.json index d31828b..58b5b14 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test3.json +++ b/test/scxml-test-framework/test/assign-current-small-step/test3.json @@ -1,19 +1,19 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b1","c1"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["b2","c2"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["d"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b1","c1"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["b2","c2"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["d"] + } + ] } diff --git a/test/scxml-test-framework/test/assign-current-small-step/test3.scxml b/test/scxml-test-framework/test/assign-current-small-step/test3.scxml index 431717e..203ed43 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test3.scxml +++ b/test/scxml-test-framework/test/assign-current-small-step/test3.scxml @@ -18,57 +18,52 @@ This test demonstrates the way the memory model semantics interact with transition order and concurrency semantics. Here, transitions originating from c1 and b1 will be taken in the same small-step, however i will not be updated until the end of that small step. The transitions actions are evaluated in document order, though, so the outcome is deterministic, so the assignment action on the transition originating from c1 will win. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <datamodel> - <data id="i"/> - </datamodel> + <datamodel> + <data id="i"/> + </datamodel> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <transition target="p" event="t1"> + <assign location="i" expr="0"/> + </transition> + </state> - <state id="a"> - <transition target="p" event="t1"> - <assign location="i" expr="0"/> - </transition> - </state> + <parallel id="p"> - <parallel id="p"> + <state id="b" initial="b1"> + <state id="b1"> + <transition event="t2" target="b2"> + <assign location="i" expr="i + 1"/> + </transition> + </state> - <state id="b" initial="b1"> - <state id="b1"> - <transition event="t2" target="b2"> - <assign location="i" expr="i + 1"/> - </transition> - </state> + <state id="b2"> + </state> + </state> - <state id="b2"> - </state> - </state> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t2" target="c2"> + <assign location="i" expr="i - 1"/> + </transition> + </state> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t2" target="c2"> - <assign location="i" expr="i - 1"/> - </transition> - </state> + <state id="c2"> + </state> + </state> - <state id="c2"> - </state> - </state> + <transition event="t3" target="d" cond="i === 0"/> + <transition event="t3" target="f"/> + </parallel> - <transition event="t3" target="d" cond="i === 0"/> - <transition event="t3" target="f"/> - </parallel> + <state id="d"/> - <state id="d"/> - - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/assign-current-small-step/test4.json b/test/scxml-test-framework/test/assign-current-small-step/test4.json index ce82511..d616eb4 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test4.json +++ b/test/scxml-test-framework/test/assign-current-small-step/test4.json @@ -1,9 +1,9 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/assign-current-small-step/test4.scxml b/test/scxml-test-framework/test/assign-current-small-step/test4.scxml index 856f943..64a8a8b 100644 --- a/test/scxml-test-framework/test/assign-current-small-step/test4.scxml +++ b/test/scxml-test-framework/test/assign-current-small-step/test4.scxml @@ -15,28 +15,27 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <datamodel> - <data id="x"/> - </datamodel> + <datamodel> + <data id="x"/> + </datamodel> - <state id="a"> - <onentry> - <assign location="x" expr="2"/> - </onentry> + <state id="a"> + <onentry> + <assign location="x" expr="2"/> + </onentry> - <transition event="t" target="b1"/> - </state> + <transition event="t" target="b1"/> + </state> - <state id="b"> - <onentry> - <assign location="x" expr="x * 3"/> - <log expr="'b, x:' + x"/> - </onentry> + <state id="b"> + <onentry> + <assign location="x" expr="x * 3"/> + <log expr="'b, x:' + x"/> + </onentry> <state id="b1"> <onentry> @@ -52,12 +51,12 @@ </onentry> </state> - <transition target="c" cond="x === 30"/> - <transition target="f"/> - </state> + <transition target="c" cond="x === 30"/> + <transition target="f"/> + </state> - <state id="c"/> + <state id="c"/> - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/assign-next-small-step/test0.json b/test/scxml-test-framework/test/assign-next-small-step/test0.json deleted file mode 100644 index 1d2faec..0000000 --- a/test/scxml-test-framework/test/assign-next-small-step/test0.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] -} - - - diff --git a/test/scxml-test-framework/test/assign-next-small-step/test1.json b/test/scxml-test-framework/test/assign-next-small-step/test1.json deleted file mode 100644 index 8424ef5..0000000 --- a/test/scxml-test-framework/test/assign-next-small-step/test1.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] -} - - - diff --git a/test/scxml-test-framework/test/assign-next-small-step/test1.scxml b/test/scxml-test-framework/test/assign-next-small-step/test1.scxml deleted file mode 100644 index bc7074e..0000000 --- a/test/scxml-test-framework/test/assign-next-small-step/test1.scxml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2011-2012 Jacob Beard, INFICON, and other SCION contributors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!-- - This test illustrates how possibly infinite loops may be created. Here, without the counter and the cond, the big-step would never complete. - --> -<scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <datamodel> - <data id="i"/> - </datamodel> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - <script> - setData('i',0); - </script> - </transition> - </state> - - <state id="b"> - <transition target="b" cond="getData('i') < 100"> - <script> - setData('i',getData('i') + 1); - </script> - </transition> - <transition target="c" cond="getData('i') === 100"/> - </state> - - <state id="c"/> - -</scxml> diff --git a/test/scxml-test-framework/test/assign-next-small-step/test2.json b/test/scxml-test-framework/test/assign-next-small-step/test2.json deleted file mode 100644 index 6769dfe..0000000 --- a/test/scxml-test-framework/test/assign-next-small-step/test2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["e"] - } - ] -} - - - - diff --git a/test/scxml-test-framework/test/assign-next-small-step/test2.scxml b/test/scxml-test-framework/test/assign-next-small-step/test2.scxml deleted file mode 100644 index 1448d70..0000000 --- a/test/scxml-test-framework/test/assign-next-small-step/test2.scxml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2011-2012 Jacob Beard, INFICON, and other SCION contributors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!-- - This is another test that illustrates how possibly infinite loops may be created. Here, without the counter and the cond, the big-step would never complete. - --> -<scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <datamodel> - <data id="i"/> - </datamodel> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - <script> - setData('i',0); - </script> - </transition> - </state> - - <state id="A"> - - <state id="b"> - <transition target="c" cond="getData('i') < 100"> - <script> - setData('i',getData('i') + 1); - </script> - </transition> - </state> - - <state id="c"> - <transition target="b" cond="getData('i') < 100"> - <script> - setData('i',getData('i') + 1); - </script> - </transition> - </state> - - <transition target="d" cond="getData('i') === 100"> - <script> - setData('i',getData('i') * 2); - </script> - </transition> - </state> - - - <state id="d"> - <transition target="e" cond="getData('i') === 200"/> - <transition target="f"/> - </state> - - <state id="e"/> - - <state id="f"/> - -</scxml> - diff --git a/test/scxml-test-framework/test/assign-next-small-step/test3.json b/test/scxml-test-framework/test/assign-next-small-step/test3.json deleted file mode 100644 index d31828b..0000000 --- a/test/scxml-test-framework/test/assign-next-small-step/test3.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b1","c1"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["b2","c2"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["d"] - } - ] -} - - - - - diff --git a/test/scxml-test-framework/test/assign-next-small-step/test3.scxml b/test/scxml-test-framework/test/assign-next-small-step/test3.scxml deleted file mode 100644 index d30be88..0000000 --- a/test/scxml-test-framework/test/assign-next-small-step/test3.scxml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2011-2012 Jacob Beard, INFICON, and other SCION contributors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!-- - This test demonstrates the way the memory model semantics interact with transition order and concurrency semantics. Here, transitions originating from c1 and b1 will be taken in the same small-step, however i will not be updated until the end of that small step. The transitions actions are evaluated in document order, though, so the outcome is deterministic, so the assignment action on the transition originating from c1 will win. ---> -<scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <datamodel> - <data id="i"/> - </datamodel> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="p" event="t1"> - <script> - setData('i',0); - </script> - </transition> - </state> - - <parallel id="p"> - - <state id="b" initial="b1"> - <state id="b1"> - <transition event="t2" target="b2"> - <script> - setData('i',getData('i') + 1); - </script> - </transition> - </state> - - <state id="b2"> - </state> - </state> - - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t2" target="c2"> - <script> - setData('i',getData('i') - 1); - </script> - </transition> - </state> - - <state id="c2"> - </state> - </state> - - <transition event="t3" target="d" cond="getData('i') === -1"/> - <transition event="t3" target="f" cond="getData('i') === 1"/> - </parallel> - - - <state id="d"/> - - <state id="f"/> - -</scxml> - - diff --git a/test/scxml-test-framework/test/atom3-basic-tests/m0.json b/test/scxml-test-framework/test/atom3-basic-tests/m0.json index 66fe90f..2121cdd 100644 --- a/test/scxml-test-framework/test/atom3-basic-tests/m0.json +++ b/test/scxml-test-framework/test/atom3-basic-tests/m0.json @@ -1,13 +1,13 @@ { - "initialConfiguration" : ["A"], - "events" : [ - { - "event" : { "name" : "e1" }, - "nextConfiguration" : ["B"] - }, - { - "event" : { "name" : "e2" }, - "nextConfiguration" : ["A"] - } - ] + "initialConfiguration" : ["A"], + "events" : [ + { + "event" : { "name" : "e1" }, + "nextConfiguration" : ["B"] + }, + { + "event" : { "name" : "e2" }, + "nextConfiguration" : ["A"] + } + ] } diff --git a/test/scxml-test-framework/test/atom3-basic-tests/m0.scxml b/test/scxml-test-framework/test/atom3-basic-tests/m0.scxml index 99bdc23..32026af 100644 --- a/test/scxml-test-framework/test/atom3-basic-tests/m0.scxml +++ b/test/scxml-test-framework/test/atom3-basic-tests/m0.scxml @@ -1,19 +1,18 @@ -<scxml xmlns="http://www.w3.org/2005/07/scxml" profile="ecmascript" version="1.0" name="root"> - <state id="A"> - <onentry> - <log expr=""entering A""/> - </onentry> - <onexit> - <log expr=""exiting A""/> - </onexit> - <transition target="B" event="e1"> - <log expr=""doing A->B transition""/> - </transition> - </state> - <initial> - <transition target="A"/> - </initial> - <state id="B"> - <transition target="A" event="e2"/> - </state> -</scxml> +<ns0:scxml + datamodel="ecmascript" + xmlns:ns0="http://www.w3.org/2005/07/scxml" version="1.0" name="root"> + <ns0:state id="A"> + <ns0:onentry> + <ns0:log expr=""entering A""/> + </ns0:onentry> + <ns0:onexit> + <ns0:log expr=""exiting A""/> + </ns0:onexit> + <ns0:transition target="B" event="e1"> + <ns0:log expr=""doing A->B transition""/> + </ns0:transition> + </ns0:state> + <ns0:state id="B"> + <ns0:transition target="A" event="e2"/> + </ns0:state> +</ns0:scxml> diff --git a/test/scxml-test-framework/test/atom3-basic-tests/m1.json b/test/scxml-test-framework/test/atom3-basic-tests/m1.json index dfb2ca4..eb25138 100644 --- a/test/scxml-test-framework/test/atom3-basic-tests/m1.json +++ b/test/scxml-test-framework/test/atom3-basic-tests/m1.json @@ -1,14 +1,14 @@ { - "initialConfiguration" : ["A"], - "events" : [ - { - "event" : { "name" : "e1" }, - "nextConfiguration" : ["B"] - }, - { - "event" : { "name" : "e2" }, - "nextConfiguration" : ["A"] - } - ] + "initialConfiguration" : ["A"], + "events" : [ + { + "event" : { "name" : "e1" }, + "nextConfiguration" : ["B"] + }, + { + "event" : { "name" : "e2" }, + "nextConfiguration" : ["A"] + } + ] } diff --git a/test/scxml-test-framework/test/atom3-basic-tests/m1.scxml b/test/scxml-test-framework/test/atom3-basic-tests/m1.scxml index e233f2c..6d8a01f 100644 --- a/test/scxml-test-framework/test/atom3-basic-tests/m1.scxml +++ b/test/scxml-test-framework/test/atom3-basic-tests/m1.scxml @@ -1,4 +1,6 @@ -<ns0:scxml xmlns:ns0="http://www.w3.org/2005/07/scxml" profile="ecmascript" version="1.0" name="root"> +<ns0:scxml + datamodel="ecmascript" + xmlns:ns0="http://www.w3.org/2005/07/scxml" version="1.0" name="root"> <ns0:state id="A"> <ns0:onentry> <ns0:log expr=""entering state A""/> @@ -10,9 +12,6 @@ <ns0:log expr=""triggered by e1""/> </ns0:transition> </ns0:state> - <ns0:initial> - <ns0:transition target="A"/> - </ns0:initial> <ns0:state id="B"> <ns0:transition target="A" event="e2"> <ns0:log expr=""triggered by e2""/> diff --git a/test/scxml-test-framework/test/atom3-basic-tests/m2.json b/test/scxml-test-framework/test/atom3-basic-tests/m2.json index 7c0f278..3ac5a1a 100644 --- a/test/scxml-test-framework/test/atom3-basic-tests/m2.json +++ b/test/scxml-test-framework/test/atom3-basic-tests/m2.json @@ -1,15 +1,15 @@ { - "initialConfiguration" : ["A"], - "events" : [ - { - "event" : { "name" : "e1" }, - "nextConfiguration" : ["B"] - }, - { - "event" : { "name" : "e2" }, - "nextConfiguration" : ["A"] - } - ] + "initialConfiguration" : ["A"], + "events" : [ + { + "event" : { "name" : "e1" }, + "nextConfiguration" : ["B"] + }, + { + "event" : { "name" : "e2" }, + "nextConfiguration" : ["A"] + } + ] } diff --git a/test/scxml-test-framework/test/atom3-basic-tests/m2.scxml b/test/scxml-test-framework/test/atom3-basic-tests/m2.scxml index 750d263..eb959b9 100644 --- a/test/scxml-test-framework/test/atom3-basic-tests/m2.scxml +++ b/test/scxml-test-framework/test/atom3-basic-tests/m2.scxml @@ -1,4 +1,6 @@ -<ns0:scxml xmlns:ns0="http://www.w3.org/2005/07/scxml" profile="ecmascript" version="1.0" name="root"> +<ns0:scxml + datamodel="ecmascript" + xmlns:ns0="http://www.w3.org/2005/07/scxml" version="1.0" name="root"> <ns0:state id="AB"> <ns0:initial> <ns0:transition target="A"/> @@ -20,7 +22,4 @@ </ns0:transition> </ns0:state> </ns0:state> - <ns0:initial> - <ns0:transition target="AB"/> - </ns0:initial> </ns0:scxml> diff --git a/test/scxml-test-framework/test/atom3-basic-tests/m3.json b/test/scxml-test-framework/test/atom3-basic-tests/m3.json index 981ac5f..7a3414f 100644 --- a/test/scxml-test-framework/test/atom3-basic-tests/m3.json +++ b/test/scxml-test-framework/test/atom3-basic-tests/m3.json @@ -1,23 +1,23 @@ { - "initialConfiguration" : ["A"], - "events" : [ - { - "event" : { "name" : "e1" }, - "nextConfiguration" : ["B"] - }, - { - "event" : { "name" : "e2" }, - "nextConfiguration" : ["A"] - }, - { - "event" : { "name" : "e1" }, - "nextConfiguration" : ["B"] - }, - { - "event" : { "name" : "e1" }, - "nextConfiguration" : ["C"] - } - ] + "initialConfiguration" : ["A"], + "events" : [ + { + "event" : { "name" : "e1" }, + "nextConfiguration" : ["B"] + }, + { + "event" : { "name" : "e2" }, + "nextConfiguration" : ["A"] + }, + { + "event" : { "name" : "e1" }, + "nextConfiguration" : ["B"] + }, + { + "event" : { "name" : "e1" }, + "nextConfiguration" : ["C"] + } + ] } diff --git a/test/scxml-test-framework/test/atom3-basic-tests/m3.scxml b/test/scxml-test-framework/test/atom3-basic-tests/m3.scxml index ddef66c..a2ceb34 100644 --- a/test/scxml-test-framework/test/atom3-basic-tests/m3.scxml +++ b/test/scxml-test-framework/test/atom3-basic-tests/m3.scxml @@ -1,4 +1,6 @@ -<ns0:scxml xmlns:ns0="http://www.w3.org/2005/07/scxml" profile="ecmascript" version="1.0" name="root"> +<ns0:scxml + datamodel="ecmascript" + xmlns:ns0="http://www.w3.org/2005/07/scxml" version="1.0" name="root"> <ns0:state id="AB"> <ns0:initial> <ns0:transition target="A"/> @@ -21,9 +23,6 @@ </ns0:state> <ns0:transition target="C" event="e1"/> </ns0:state> - <ns0:initial> - <ns0:transition target="AB"/> - </ns0:initial> <ns0:state id="C"> <ns0:onentry> <ns0:log expr=""entering state C""/> diff --git a/test/scxml-test-framework/test/basic/basic0.json b/test/scxml-test-framework/test/basic/basic0.json index 871e757..0df730d 100644 --- a/test/scxml-test-framework/test/basic/basic0.json +++ b/test/scxml-test-framework/test/basic/basic0.json @@ -1,6 +1,6 @@ { - "initialConfiguration" : ["a"], - "events" : [] + "initialConfiguration" : ["a"], + "events" : [] } diff --git a/test/scxml-test-framework/test/basic/basic0.scxml b/test/scxml-test-framework/test/basic/basic0.scxml index 926495f..23eff63 100644 --- a/test/scxml-test-framework/test/basic/basic0.scxml +++ b/test/scxml-test-framework/test/basic/basic0.scxml @@ -15,13 +15,12 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <state id="a"/> + <state id="a"/> </scxml> diff --git a/test/scxml-test-framework/test/basic/basic1.json b/test/scxml-test-framework/test/basic/basic1.json index 1d2faec..c27c2fd 100644 --- a/test/scxml-test-framework/test/basic/basic1.json +++ b/test/scxml-test-framework/test/basic/basic1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/basic/basic1.scxml b/test/scxml-test-framework/test/basic/basic1.scxml index d12b092..304efbc 100644 --- a/test/scxml-test-framework/test/basic/basic1.scxml +++ b/test/scxml-test-framework/test/basic/basic1.scxml @@ -15,19 +15,14 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <transition target="b" event="t"/> + </state> - <state id="a"> - <transition target="b" event="t"/> - </state> - - <state id="b"/> + <state id="b"/> </scxml> diff --git a/test/scxml-test-framework/test/basic/basic2.json b/test/scxml-test-framework/test/basic/basic2.json index 3fa286e..9eac7e9 100644 --- a/test/scxml-test-framework/test/basic/basic2.json +++ b/test/scxml-test-framework/test/basic/basic2.json @@ -1,15 +1,15 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/basic/basic2.scxml b/test/scxml-test-framework/test/basic/basic2.scxml index 66364c3..68057fd 100644 --- a/test/scxml-test-framework/test/basic/basic2.scxml +++ b/test/scxml-test-framework/test/basic/basic2.scxml @@ -15,24 +15,18 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <transition target="b" event="t"/> + </state> - <state id="a"> - <transition target="b" event="t"/> - </state> + <state id="b"> + <transition target="c" event="t2"/> + </state> - <state id="b"> - <transition target="c" event="t2"/> - </state> - - <state id="c"/> + <state id="c"/> </scxml> diff --git a/test/scxml-test-framework/test/cond-js/TestConditionalTransition.json b/test/scxml-test-framework/test/cond-js/TestConditionalTransition.json index b586923..2806be0 100644 --- a/test/scxml-test-framework/test/cond-js/TestConditionalTransition.json +++ b/test/scxml-test-framework/test/cond-js/TestConditionalTransition.json @@ -1,31 +1,31 @@ { - "initialConfiguration" : ["b"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["d1"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["e1"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["f2"] - }, - { - "event" : { "name" : "t4" }, - "nextConfiguration" : ["h"] - }, - { - "event" : { "name" : "t5" }, - "nextConfiguration" : ["i"] - }, - { - "event" : { "name" : "t5" }, - "nextConfiguration" : ["last"] - } - ] + "initialConfiguration" : ["b"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["d1"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["e1"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["f2"] + }, + { + "event" : { "name" : "t4" }, + "nextConfiguration" : ["h"] + }, + { + "event" : { "name" : "t5" }, + "nextConfiguration" : ["i"] + }, + { + "event" : { "name" : "t5" }, + "nextConfiguration" : ["last"] + } + ] } diff --git a/test/scxml-test-framework/test/cond-js/TestConditionalTransition.scxml b/test/scxml-test-framework/test/cond-js/TestConditionalTransition.scxml index ed4b733..5d541be 100644 --- a/test/scxml-test-framework/test/cond-js/TestConditionalTransition.scxml +++ b/test/scxml-test-framework/test/cond-js/TestConditionalTransition.scxml @@ -20,84 +20,80 @@ This is to test transitions with guard conditions, and multiple transitions originating from the same state. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - name="root" - profile="ecmascript"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + name="root"> - <initial> - <transition target="a"/> - </initial> + <!-- default transition --> + <state id="a"> + <transition target="b"/> + </state> - <!-- default transition --> - <state id="a"> - <transition target="b"/> - </state> + <!-- regular transition --> + <state id="b"> + <transition target="c" event="t1"/> + </state> - <!-- regular transition --> - <state id="b"> - <transition target="c" event="t1"/> - </state> + <!-- two default transitions, first should get priority (based on document order), end in d1 --> + <state id="c"> + <transition target="d1"/> + <transition target="d2"/> + </state> - <!-- two default transitions, first should get priority (based on document order), end in d1 --> - <state id="c"> - <transition target="d1"/> - <transition target="d2"/> - </state> + <!-- two regular transitions, first should get priority, end in e1 --> + <state id="d1"> + <transition target="e1" event="t2"/> + <transition target="e2" event="t2"/> + </state> - <!-- two regular transitions, first should get priority, end in e1 --> - <state id="d1"> - <transition target="e1" event="t2"/> - <transition target="e2" event="t2"/> - </state> + <state id="d2"/> - <state id="d2"/> + <!-- two transitions with guard conditions; + first has priority, but will fail, so second transition should be taken, + end in f2 --> + <state id="e1"> + <transition target="f1" event="t3" cond="false"/> + <transition target="f2" event="t3" cond="true"/> + </state> - <!-- two transitions with guard conditions; - first has priority, but will fail, so second transition should be taken, - end in f2 --> - <state id="e1"> - <transition target="f1" event="t3" cond="false"/> - <transition target="f2" event="t3" cond="true"/> - </state> + <state id="e2"/> - <state id="e2"/> + <state id="f1"/> - <state id="f1"/> + <!-- like above, but with three transitions --> + <state id="f2"> + <transition target="g1" event="t4" cond="false"/> + <transition target="g2" event="t4" cond="false"/> + <transition target="g3" event="t4" cond="true"/> + </state> - <!-- like above, but with three transitions --> - <state id="f2"> - <transition target="g1" event="t4" cond="false"/> - <transition target="g2" event="t4" cond="false"/> - <transition target="g3" event="t4" cond="true"/> - </state> + <state id="g1"/> - <state id="g1"/> + <state id="g2"/> - <state id="g2"/> + <state id="g3"> - <state id="g3"> + <initial> + <transition target="h"/> + </initial> - <initial> - <transition target="h"/> - </initial> + <!-- this one should pass --> + <state id="h"> + <transition target="i" event="t5" cond="true"/> + </state> - <!-- this one should pass --> - <state id="h"> - <transition target="i" event="t5" cond="true"/> - </state> + <!-- this one should not pass, and the outer transition should be taken --> + <state id="i"> + <transition target="j" event="t5" cond="false"/> + </state> - <!-- this one should not pass, and the outer transition should be taken --> - <state id="i"> - <transition target="j" event="t5" cond="false"/> - </state> + <state id="j"/> - <state id="j"/> + <transition target="last" event="t5" cond="true"/> + </state> - <transition target="last" event="t5" cond="true"/> - </state> - - <state id="last"/> + <state id="last"/> </scxml> diff --git a/test/scxml-test-framework/test/cond-js/test0.json b/test/scxml-test-framework/test/cond-js/test0.json index 1d2faec..c27c2fd 100644 --- a/test/scxml-test-framework/test/cond-js/test0.json +++ b/test/scxml-test-framework/test/cond-js/test0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/cond-js/test0.scxml b/test/scxml-test-framework/test/cond-js/test0.scxml index 11d6a3b..696f55b 100644 --- a/test/scxml-test-framework/test/cond-js/test0.scxml +++ b/test/scxml-test-framework/test/cond-js/test0.scxml @@ -15,20 +15,15 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <transition target="b" event="t" cond="true"/> + </state> - <state id="a"> - <transition target="b" event="t" cond="true"/> - </state> - - <state id="b"/> + <state id="b"/> </scxml> diff --git a/test/scxml-test-framework/test/cond-js/test1.json b/test/scxml-test-framework/test/cond-js/test1.json index 1d2faec..c27c2fd 100644 --- a/test/scxml-test-framework/test/cond-js/test1.json +++ b/test/scxml-test-framework/test/cond-js/test1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/cond-js/test1.scxml b/test/scxml-test-framework/test/cond-js/test1.scxml index a25535b..84fe1fa 100644 --- a/test/scxml-test-framework/test/cond-js/test1.scxml +++ b/test/scxml-test-framework/test/cond-js/test1.scxml @@ -15,23 +15,18 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <transition target="f" event="t" cond="false"/> + <transition target="b" event="t" cond="true"/> + </state> - <state id="a"> - <transition target="f" event="t" cond="false"/> - <transition target="b" event="t" cond="true"/> - </state> + <state id="b"/> - <state id="b"/> - - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/cond-js/test2.json b/test/scxml-test-framework/test/cond-js/test2.json index 1d2faec..c27c2fd 100644 --- a/test/scxml-test-framework/test/cond-js/test2.json +++ b/test/scxml-test-framework/test/cond-js/test2.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/cond-js/test2.scxml b/test/scxml-test-framework/test/cond-js/test2.scxml index 11d6a3b..696f55b 100644 --- a/test/scxml-test-framework/test/cond-js/test2.scxml +++ b/test/scxml-test-framework/test/cond-js/test2.scxml @@ -15,20 +15,15 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <transition target="b" event="t" cond="true"/> + </state> - <state id="a"> - <transition target="b" event="t" cond="true"/> - </state> - - <state id="b"/> + <state id="b"/> </scxml> diff --git a/test/scxml-test-framework/test/default-initial-state/initial1.json b/test/scxml-test-framework/test/default-initial-state/initial1.json index 1d2faec..c27c2fd 100644 --- a/test/scxml-test-framework/test/default-initial-state/initial1.json +++ b/test/scxml-test-framework/test/default-initial-state/initial1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/default-initial-state/initial1.scxml b/test/scxml-test-framework/test/default-initial-state/initial1.scxml index 0e28f5a..76634c2 100644 --- a/test/scxml-test-framework/test/default-initial-state/initial1.scxml +++ b/test/scxml-test-framework/test/default-initial-state/initial1.scxml @@ -15,15 +15,15 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" > - <!-- notice that no id is specified here --> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + <!-- notice that no id is specified here --> - <state id="a"> - <transition target="b" event="t"/> - </state> + <state id="a"> + <transition target="b" event="t"/> + </state> - <state id="b"/> + <state id="b"/> </scxml> diff --git a/test/scxml-test-framework/test/default-initial-state/initial2.json b/test/scxml-test-framework/test/default-initial-state/initial2.json index 12656c3..6c8bd47 100644 --- a/test/scxml-test-framework/test/default-initial-state/initial2.json +++ b/test/scxml-test-framework/test/default-initial-state/initial2.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/default-initial-state/initial2.scxml b/test/scxml-test-framework/test/default-initial-state/initial2.scxml index da3aa62..0fc28b9 100644 --- a/test/scxml-test-framework/test/default-initial-state/initial2.scxml +++ b/test/scxml-test-framework/test/default-initial-state/initial2.scxml @@ -15,16 +15,16 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <state id="a"> - <transition target="b" event="t"/> - </state> + <state id="a"> + <transition target="b" event="t"/> + </state> - <state id="b"/> + <state id="b"/> </scxml> diff --git a/test/scxml-test-framework/test/default-initial-state/initial3.json b/test/scxml-test-framework/test/default-initial-state/initial3.json deleted file mode 100644 index 510b8b6..0000000 --- a/test/scxml-test-framework/test/default-initial-state/initial3.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] -} - - - - - diff --git a/test/scxml-test-framework/test/default-initial-state/initial3.scxml b/test/scxml-test-framework/test/default-initial-state/initial3.scxml deleted file mode 100644 index 2517fb3..0000000 --- a/test/scxml-test-framework/test/default-initial-state/initial3.scxml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2011-2012 Jacob Beard, INFICON, and other SCION contributors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" > - - <initial> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"/> - </state> - - <state id="b"/> - -</scxml> - diff --git a/test/scxml-test-framework/test/delayedSend/send1.json b/test/scxml-test-framework/test/delayedSend/send1.json index b219e13..2c1cda6 100644 --- a/test/scxml-test-framework/test/delayedSend/send1.json +++ b/test/scxml-test-framework/test/delayedSend/send1.json @@ -1,16 +1,16 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b"] - }, - { - "after" : 100, - "event" : { "name" : "t2" }, - "nextConfiguration" : ["d"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b"] + }, + { + "after" : 100, + "event" : { "name" : "t2" }, + "nextConfiguration" : ["d"] + } + ] } diff --git a/test/scxml-test-framework/test/delayedSend/send1.scxml b/test/scxml-test-framework/test/delayedSend/send1.scxml index 5e9b83d..de2d401 100644 --- a/test/scxml-test-framework/test/delayedSend/send1.scxml +++ b/test/scxml-test-framework/test/delayedSend/send1.scxml @@ -15,30 +15,25 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t1"> - <send event="s" delay="10ms"/> - </transition> - </state> - - <state id="b"> - <transition target="c" event="s"/> - </state> - - <state id="c"> - <transition target="d" event="t2"/> - </state> - - <state id="d"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <state id="a"> + <transition target="b" event="t1"> + <send event="s" delay="10ms"/> + </transition> + </state> + + <state id="b"> + <transition target="c" event="s"/> + </state> + + <state id="c"> + <transition target="d" event="t2"/> + </state> + + <state id="d"/> </scxml> diff --git a/test/scxml-test-framework/test/delayedSend/send2.json b/test/scxml-test-framework/test/delayedSend/send2.json index b219e13..2c1cda6 100644 --- a/test/scxml-test-framework/test/delayedSend/send2.json +++ b/test/scxml-test-framework/test/delayedSend/send2.json @@ -1,16 +1,16 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b"] - }, - { - "after" : 100, - "event" : { "name" : "t2" }, - "nextConfiguration" : ["d"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b"] + }, + { + "after" : 100, + "event" : { "name" : "t2" }, + "nextConfiguration" : ["d"] + } + ] } diff --git a/test/scxml-test-framework/test/delayedSend/send2.scxml b/test/scxml-test-framework/test/delayedSend/send2.scxml index b88e127..c16064a 100644 --- a/test/scxml-test-framework/test/delayedSend/send2.scxml +++ b/test/scxml-test-framework/test/delayedSend/send2.scxml @@ -15,33 +15,28 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <onexit> + <send event="s" delay="10ms"/> + </onexit> - <state id="a"> - <onexit> - <send event="s" delay="10ms"/> - </onexit> + <transition target="b" event="t1"> + </transition> + </state> - <transition target="b" event="t1"> - </transition> - </state> + <state id="b"> + <transition target="c" event="s"/> + </state> - <state id="b"> - <transition target="c" event="s"/> - </state> + <state id="c"> + <transition target="d" event="t2"/> + </state> - <state id="c"> - <transition target="d" event="t2"/> - </state> - - <state id="d"/> + <state id="d"/> </scxml> diff --git a/test/scxml-test-framework/test/delayedSend/send3.json b/test/scxml-test-framework/test/delayedSend/send3.json index b219e13..2c1cda6 100644 --- a/test/scxml-test-framework/test/delayedSend/send3.json +++ b/test/scxml-test-framework/test/delayedSend/send3.json @@ -1,16 +1,16 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b"] - }, - { - "after" : 100, - "event" : { "name" : "t2" }, - "nextConfiguration" : ["d"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b"] + }, + { + "after" : 100, + "event" : { "name" : "t2" }, + "nextConfiguration" : ["d"] + } + ] } diff --git a/test/scxml-test-framework/test/delayedSend/send3.scxml b/test/scxml-test-framework/test/delayedSend/send3.scxml index efcbc3b..6c2fcc9 100644 --- a/test/scxml-test-framework/test/delayedSend/send3.scxml +++ b/test/scxml-test-framework/test/delayedSend/send3.scxml @@ -15,33 +15,28 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <transition target="b" event="t1"> + </transition> + </state> - <state id="a"> - <transition target="b" event="t1"> - </transition> - </state> + <state id="b"> + <onentry> + <send event="s" delay="10ms"/> + </onentry> - <state id="b"> - <onentry> - <send event="s" delay="10ms"/> - </onentry> + <transition target="c" event="s"/> + </state> - <transition target="c" event="s"/> - </state> + <state id="c"> + <transition target="d" event="t2"/> + </state> - <state id="c"> - <transition target="d" event="t2"/> - </state> - - <state id="d"/> + <state id="d"/> </scxml> diff --git a/test/scxml-test-framework/test/documentOrder/documentOrder0.json b/test/scxml-test-framework/test/documentOrder/documentOrder0.json index 1d2faec..c27c2fd 100644 --- a/test/scxml-test-framework/test/documentOrder/documentOrder0.json +++ b/test/scxml-test-framework/test/documentOrder/documentOrder0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/documentOrder/documentOrder0.scxml b/test/scxml-test-framework/test/documentOrder/documentOrder0.scxml index 21d25e7..530a981 100644 --- a/test/scxml-test-framework/test/documentOrder/documentOrder0.scxml +++ b/test/scxml-test-framework/test/documentOrder/documentOrder0.scxml @@ -15,23 +15,18 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"/> - <transition target="c" event="t"/> - </state> - - <state id="b"/> - - <state id="c"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <state id="a"> + <transition target="b" event="t"/> + <transition target="c" event="t"/> + </state> + + <state id="b"/> + + <state id="c"/> </scxml> diff --git a/test/scxml-test-framework/test/foreach/test1.json b/test/scxml-test-framework/test/foreach/test1.json index 8424ef5..0e49c49 100644 --- a/test/scxml-test-framework/test/foreach/test1.json +++ b/test/scxml-test-framework/test/foreach/test1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/foreach/test1.scxml b/test/scxml-test-framework/test/foreach/test1.scxml index 80762da..6b7f87e 100644 --- a/test/scxml-test-framework/test/foreach/test1.scxml +++ b/test/scxml-test-framework/test/foreach/test1.scxml @@ -18,34 +18,33 @@ This test illustrates how possibly infinite loops may be created. Here, without the counter and the cond, the big-step would never complete. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <datamodel> - <data id="myArray" expr="[1,3,5,7,9]"/> - <data id="myItem" expr="0"/> - <data id="myIndex" expr="0"/> - <data id="sum" expr="0"/> - <data id="indexSum" expr="0"/> - </datamodel> + <datamodel> + <data id="myArray" expr="[1,3,5,7,9]"/> + <data id="myItem" expr="0"/> + <data id="myIndex" expr="0"/> + <data id="sum" expr="0"/> + <data id="indexSum" expr="0"/> + </datamodel> - <state id="a"> - <onentry> - <log label="before" expr="[sum,indexSum]"/> - <foreach array="myArray" item="myItem" index="myIndex"> - <assign location="sum" expr="sum + myItem"/> - <assign location="indexSum" expr="indexSum + myIndex"/> - </foreach> - <foreach array="myArray" item="myItem"> - <assign location="sum" expr="sum + myItem"/> - </foreach> - <log label="after" expr="[sum,indexSum]"/> - </onentry> - <transition target="c" event="t" cond="sum === 50 && indexSum === 10"/> - </state> + <state id="a"> + <onentry> + <log label="before" expr="[sum,indexSum]"/> + <foreach array="myArray" item="myItem" index="myIndex"> + <assign location="sum" expr="sum + myItem"/> + <assign location="indexSum" expr="indexSum + myIndex"/> + </foreach> + <foreach array="myArray" item="myItem"> + <assign location="sum" expr="sum + myItem"/> + </foreach> + <log label="after" expr="[sum,indexSum]"/> + </onentry> + <transition target="c" event="t" cond="sum === 50 && indexSum === 10"/> + </state> - <state id="c"/> + <state id="c"/> </scxml> diff --git a/test/scxml-test-framework/test/hierarchy+documentOrder/test0.json b/test/scxml-test-framework/test/hierarchy+documentOrder/test0.json index 883bfd9..116f26c 100644 --- a/test/scxml-test-framework/test/hierarchy+documentOrder/test0.json +++ b/test/scxml-test-framework/test/hierarchy+documentOrder/test0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2"] - } - ] + "initialConfiguration" : ["a1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a2"] + } + ] } diff --git a/test/scxml-test-framework/test/hierarchy+documentOrder/test0.scxml b/test/scxml-test-framework/test/hierarchy+documentOrder/test0.scxml index 6b48a10..540c944 100644 --- a/test/scxml-test-framework/test/hierarchy+documentOrder/test0.scxml +++ b/test/scxml-test-framework/test/hierarchy+documentOrder/test0.scxml @@ -15,30 +15,25 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a1"/> - </initial> - - <state id="a"> - <state id="a1"> - <transition target="a2" event="t"/> - <transition target="c" event="t"/> - </state> - - <state id="a2"> - </state> - - <transition target="b" event="t"/> - </state> - - <state id="b"/> - - <state id="c"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <state id="a"> + <state id="a1"> + <transition target="a2" event="t"/> + <transition target="c" event="t"/> + </state> + + <state id="a2"> + </state> + + <transition target="b" event="t"/> + </state> + + <state id="b"/> + + <state id="c"/> </scxml> diff --git a/test/scxml-test-framework/test/hierarchy+documentOrder/test1.json b/test/scxml-test-framework/test/hierarchy+documentOrder/test1.json index 12390fe..7fd2206 100644 --- a/test/scxml-test-framework/test/hierarchy+documentOrder/test1.json +++ b/test/scxml-test-framework/test/hierarchy+documentOrder/test1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/hierarchy+documentOrder/test1.scxml b/test/scxml-test-framework/test/hierarchy+documentOrder/test1.scxml index d8b23f0..7f29543 100644 --- a/test/scxml-test-framework/test/hierarchy+documentOrder/test1.scxml +++ b/test/scxml-test-framework/test/hierarchy+documentOrder/test1.scxml @@ -15,30 +15,25 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a1"/> - </initial> - - <state id="a"> - <state id="a1"> - <transition target="b" event="t"/> - <transition target="c" event="t"/> - </state> - - <state id="a2"> - </state> - - <transition target="a2" event="t"/> - </state> - - <state id="b"/> - - <state id="c"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <state id="a"> + <state id="a1"> + <transition target="b" event="t"/> + <transition target="c" event="t"/> + </state> + + <state id="a2"> + </state> + + <transition target="a2" event="t"/> + </state> + + <state id="b"/> + + <state id="c"/> </scxml> diff --git a/test/scxml-test-framework/test/hierarchy/hier0.json b/test/scxml-test-framework/test/hierarchy/hier0.json index 883bfd9..116f26c 100644 --- a/test/scxml-test-framework/test/hierarchy/hier0.json +++ b/test/scxml-test-framework/test/hierarchy/hier0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2"] - } - ] + "initialConfiguration" : ["a1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a2"] + } + ] } diff --git a/test/scxml-test-framework/test/hierarchy/hier0.scxml b/test/scxml-test-framework/test/hierarchy/hier0.scxml index 1c45ba7..dad78a3 100644 --- a/test/scxml-test-framework/test/hierarchy/hier0.scxml +++ b/test/scxml-test-framework/test/hierarchy/hier0.scxml @@ -15,23 +15,18 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a1"/> - </initial> - - <state id="a"> - <state id="a1"> - <transition target="a2" event="t"/> - </state> - - <state id="a2"> - </state> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <state id="a"> + <state id="a1"> + <transition target="a2" event="t"/> + </state> + + <state id="a2"> + </state> + </state> </scxml> diff --git a/test/scxml-test-framework/test/hierarchy/hier1.json b/test/scxml-test-framework/test/hierarchy/hier1.json index 883bfd9..116f26c 100644 --- a/test/scxml-test-framework/test/hierarchy/hier1.json +++ b/test/scxml-test-framework/test/hierarchy/hier1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2"] - } - ] + "initialConfiguration" : ["a1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a2"] + } + ] } diff --git a/test/scxml-test-framework/test/hierarchy/hier1.scxml b/test/scxml-test-framework/test/hierarchy/hier1.scxml index 654994d..c4d76ee 100644 --- a/test/scxml-test-framework/test/hierarchy/hier1.scxml +++ b/test/scxml-test-framework/test/hierarchy/hier1.scxml @@ -15,27 +15,22 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="a1"/> - </initial> + <state id="a"> + <state id="a1"> + <transition target="a2" event="t"/> + </state> - <state id="a"> - <state id="a1"> - <transition target="a2" event="t"/> - </state> + <state id="a2"> + </state> - <state id="a2"> - </state> + <transition target="b" event="t"/> + </state> - <transition target="b" event="t"/> - </state> - - <state id="b"/> + <state id="b"/> </scxml> diff --git a/test/scxml-test-framework/test/hierarchy/hier2.json b/test/scxml-test-framework/test/hierarchy/hier2.json index 12390fe..7fd2206 100644 --- a/test/scxml-test-framework/test/hierarchy/hier2.json +++ b/test/scxml-test-framework/test/hierarchy/hier2.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/hierarchy/hier2.scxml b/test/scxml-test-framework/test/hierarchy/hier2.scxml index e1c3bb1..d0405f6 100644 --- a/test/scxml-test-framework/test/hierarchy/hier2.scxml +++ b/test/scxml-test-framework/test/hierarchy/hier2.scxml @@ -15,27 +15,22 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="a1"/> - </initial> + <state id="a"> + <state id="a1"> + <transition target="b" event="t"/> + </state> - <state id="a"> - <state id="a1"> - <transition target="b" event="t"/> - </state> + <state id="a2"> + </state> - <state id="a2"> - </state> + <transition target="a2" event="t"/> + </state> - <transition target="a2" event="t"/> - </state> - - <state id="b"/> + <state id="b"/> </scxml> diff --git a/test/scxml-test-framework/test/history/history0.json b/test/scxml-test-framework/test/history/history0.json index b614a61..cba3ae5 100644 --- a/test/scxml-test-framework/test/history/history0.json +++ b/test/scxml-test-framework/test/history/history0.json @@ -1,23 +1,23 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b2"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["b3"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["a"] - }, - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b3"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b2"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["b3"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["a"] + }, + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b3"] + } + ] } diff --git a/test/scxml-test-framework/test/history/history0.scxml b/test/scxml-test-framework/test/history/history0.scxml index 1473049..0dbd622 100644 --- a/test/scxml-test-framework/test/history/history0.scxml +++ b/test/scxml-test-framework/test/history/history0.scxml @@ -15,32 +15,31 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <state id="a"> - <transition target="h" event="t1"/> - </state> + <state id="a"> + <transition target="h" event="t1"/> + </state> - <state id="b" initial="b1"> + <state id="b" initial="b1"> - <history id="h"> - <transition target="b2"/> - </history> + <history id="h"> + <transition target="b2"/> + </history> - <state id="b1"/> + <state id="b1"/> - <state id="b2"> - <transition event="t2" target="b3"/> - </state> + <state id="b2"> + <transition event="t2" target="b3"/> + </state> - <state id="b3"> - <transition event="t3" target="a"/> - </state> - </state> + <state id="b3"> + <transition event="t3" target="a"/> + </state> + </state> </scxml> diff --git a/test/scxml-test-framework/test/history/history1.json b/test/scxml-test-framework/test/history/history1.json index 02eb502..1dfeb82 100644 --- a/test/scxml-test-framework/test/history/history1.json +++ b/test/scxml-test-framework/test/history/history1.json @@ -1,23 +1,23 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b1.2"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["b1.3"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["a"] - }, - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b1.3"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b1.2"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["b1.3"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["a"] + }, + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b1.3"] + } + ] } diff --git a/test/scxml-test-framework/test/history/history1.scxml b/test/scxml-test-framework/test/history/history1.scxml index 4dd5aec..6d2235f 100644 --- a/test/scxml-test-framework/test/history/history1.scxml +++ b/test/scxml-test-framework/test/history/history1.scxml @@ -15,36 +15,35 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <state id="a"> - <transition target="h" event="t1"/> - </state> + <state id="a"> + <transition target="h" event="t1"/> + </state> - <state id="b" initial="b1"> + <state id="b" initial="b1"> - <history id="h" type="deep"> - <transition target="b1.2"/> - </history> + <history id="h" type="deep"> + <transition target="b1.2"/> + </history> - <state id="b1" initial="b1.1"> - <state id="b1.1"/> + <state id="b1" initial="b1.1"> + <state id="b1.1"/> - <state id="b1.2"> - <transition event="t2" target="b1.3"/> - </state> + <state id="b1.2"> + <transition event="t2" target="b1.3"/> + </state> - <state id="b1.3"> - <transition event="t3" target="a"/> - </state> - </state> + <state id="b1.3"> + <transition event="t3" target="a"/> + </state> + </state> - </state> + </state> </scxml> diff --git a/test/scxml-test-framework/test/history/history2.json b/test/scxml-test-framework/test/history/history2.json index 3bbcac1..4cc3ee4 100644 --- a/test/scxml-test-framework/test/history/history2.json +++ b/test/scxml-test-framework/test/history/history2.json @@ -1,23 +1,23 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b1.2"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["b1.3"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["a"] - }, - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b1.1"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b1.2"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["b1.3"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["a"] + }, + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b1.1"] + } + ] } diff --git a/test/scxml-test-framework/test/history/history2.scxml b/test/scxml-test-framework/test/history/history2.scxml index 9c691cb..2a2ab95 100644 --- a/test/scxml-test-framework/test/history/history2.scxml +++ b/test/scxml-test-framework/test/history/history2.scxml @@ -15,36 +15,35 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <state id="a"> - <transition target="h" event="t1"/> - </state> + <state id="a"> + <transition target="h" event="t1"/> + </state> - <state id="b" initial="b1"> + <state id="b" initial="b1"> - <history id="h" type="shallow"> - <transition target="b1.2"/> - </history> + <history id="h" type="shallow"> + <transition target="b1.2"/> + </history> - <state id="b1" initial="b1.1"> - <state id="b1.1"/> + <state id="b1" initial="b1.1"> + <state id="b1.1"/> - <state id="b1.2"> - <transition event="t2" target="b1.3"/> - </state> + <state id="b1.2"> + <transition event="t2" target="b1.3"/> + </state> - <state id="b1.3"> - <transition event="t3" target="a"/> - </state> - </state> + <state id="b1.3"> + <transition event="t3" target="a"/> + </state> + </state> - </state> + </state> </scxml> diff --git a/test/scxml-test-framework/test/history/history3.json b/test/scxml-test-framework/test/history/history3.json index d7b3593..4786e3a 100644 --- a/test/scxml-test-framework/test/history/history3.json +++ b/test/scxml-test-framework/test/history/history3.json @@ -1,23 +1,23 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b1","c1"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["b2","c2"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["a"] - }, - { - "event" : { "name" : "t4" }, - "nextConfiguration" : ["b2","c2"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b1","c1"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["b2","c2"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["a"] + }, + { + "event" : { "name" : "t4" }, + "nextConfiguration" : ["b2","c2"] + } + ] } diff --git a/test/scxml-test-framework/test/history/history3.scxml b/test/scxml-test-framework/test/history/history3.scxml index 0723031..6fd4de1 100644 --- a/test/scxml-test-framework/test/history/history3.scxml +++ b/test/scxml-test-framework/test/history/history3.scxml @@ -15,39 +15,40 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> - - - <state id="a"> - <transition target="p" event="t1"/> - <transition target="h" event="t4"/> - </state> - - <parallel id="p"> - <history id="h" type="deep"/> - - <state id="b" initial="b1"> - <state id="b1"> - <transition target="b2" event="t2"/> - </state> - - <state id="b2"/> - </state> - - <state id="c" initial="c1"> - <state id="c1"> - <transition target="c2" event="t2"/> - </state> - - <state id="c2"/> - </state> - - <transition target="a" event="t3"/> - </parallel> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> + + + <state id="a"> + <transition target="p" event="t1"/> + <transition target="h" event="t4"/> + </state> + + <parallel id="p"> + <history id="h" type="deep"> + <transition target="b"/> + </history> + + <state id="b" initial="b1"> + <state id="b1"> + <transition target="b2" event="t2"/> + </state> + + <state id="b2"/> + </state> + + <state id="c" initial="c1"> + <state id="c1"> + <transition target="c2" event="t2"/> + </state> + + <state id="c2"/> + </state> + + <transition target="a" event="t3"/> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/history/history4.json b/test/scxml-test-framework/test/history/history4.json index 094701b..e5bbc31 100644 --- a/test/scxml-test-framework/test/history/history4.json +++ b/test/scxml-test-framework/test/history/history4.json @@ -1,43 +1,43 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b1.1","c1.1"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["b1.2","c1.2"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["b2.1","c2.1"] - }, - { - "event" : { "name" : "t4" }, - "nextConfiguration" : ["b2.2","c2.2"] - }, - { - "event" : { "name" : "t5" }, - "nextConfiguration" : ["a"] - }, - { - "event" : { "name" : "t6" }, - "nextConfiguration" : ["b2.2","c2.1"] - }, - { - "event" : { "name" : "t7" }, - "nextConfiguration" : ["b2.2","c2.2"] - }, - { - "event" : { "name" : "t8" }, - "nextConfiguration" : ["a"] - }, - { - "event" : { "name" : "t9" }, - "nextConfiguration" : ["b2.2","c2.2"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b1.1","c1.1"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["b1.2","c1.2"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["b2.1","c2.1"] + }, + { + "event" : { "name" : "t4" }, + "nextConfiguration" : ["b2.2","c2.2"] + }, + { + "event" : { "name" : "t5" }, + "nextConfiguration" : ["a"] + }, + { + "event" : { "name" : "t6" }, + "nextConfiguration" : ["b2.2","c2.1"] + }, + { + "event" : { "name" : "t7" }, + "nextConfiguration" : ["b2.2","c2.2"] + }, + { + "event" : { "name" : "t8" }, + "nextConfiguration" : ["a"] + }, + { + "event" : { "name" : "t9" }, + "nextConfiguration" : ["b2.2","c2.2"] + } + ] } diff --git a/test/scxml-test-framework/test/history/history4.scxml b/test/scxml-test-framework/test/history/history4.scxml index 4296c8a..4c59e17 100644 --- a/test/scxml-test-framework/test/history/history4.scxml +++ b/test/scxml-test-framework/test/history/history4.scxml @@ -18,77 +18,78 @@ illustrates both deep and shallow history, working in both AND and OR states --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> - - - <state id="a"> - <transition target="p" event="t1"/> - <transition target="p" event="t6"/> - <transition target="hp" event="t9"/> - </state> - - <parallel id="p"> - <history id="hp" type="deep"/> - - <state id="b" initial="hb"> - - <history id="hb" type="deep"> - <transition target="b1"/> - </history> - - <state id="b1" initial="b1.1"> - <state id="b1.1"> - <transition target="b1.2" event="t2"/> - </state> - - <state id="b1.2"> - <transition target="b2" event="t3"/> - </state> - </state> - - <state id="b2" initial="b2.1"> - <state id="b2.1"> - <transition target="b2.2" event="t4"/> - </state> - - <state id="b2.2"> - <transition target="a" event="t5"/> - <transition target="a" event="t8"/> - </state> - </state> - </state> - - <state id="c" initial="hc"> - - <history id="hc" type="shallow"> - <transition target="c1"/> - </history> - - <state id="c1" initial="c1.1"> - <state id="c1.1"> - <transition target="c1.2" event="t2"/> - </state> - - <state id="c1.2"> - <transition target="c2" event="t3"/> - </state> - </state> - - <state id="c2" initial="c2.1"> - <state id="c2.1"> - <transition target="c2.2" event="t4"/> - <transition target="c2.2" event="t7"/> - </state> - - <state id="c2.2"> - </state> - </state> - </state> - </parallel> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> + + + <state id="a"> + <transition target="p" event="t1"/> + <transition target="p" event="t6"/> + <transition target="hp" event="t9"/> + </state> + + <parallel id="p"> + <history id="hp" type="deep"> + <transition target="b"/> + </history> + + <state id="b" initial="hb"> + + <history id="hb" type="deep"> + <transition target="b1"/> + </history> + + <state id="b1" initial="b1.1"> + <state id="b1.1"> + <transition target="b1.2" event="t2"/> + </state> + + <state id="b1.2"> + <transition target="b2" event="t3"/> + </state> + </state> + + <state id="b2" initial="b2.1"> + <state id="b2.1"> + <transition target="b2.2" event="t4"/> + </state> + + <state id="b2.2"> + <transition target="a" event="t5"/> + <transition target="a" event="t8"/> + </state> + </state> + </state> + + <state id="c" initial="hc"> + + <history id="hc" type="shallow"> + <transition target="c1"/> + </history> + + <state id="c1" initial="c1.1"> + <state id="c1.1"> + <transition target="c1.2" event="t2"/> + </state> + + <state id="c1.2"> + <transition target="c2" event="t3"/> + </state> + </state> + + <state id="c2" initial="c2.1"> + <state id="c2.1"> + <transition target="c2.2" event="t4"/> + <transition target="c2.2" event="t7"/> + </state> + + <state id="c2.2"> + </state> + </state> + </state> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/history/history5.json b/test/scxml-test-framework/test/history/history5.json index a6c52a7..fcd1cb6 100644 --- a/test/scxml-test-framework/test/history/history5.json +++ b/test/scxml-test-framework/test/history/history5.json @@ -1,19 +1,19 @@ { - "initialConfiguration" : ["i1","j","h","g","f1","k"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["i2","j","h","g","f2","k"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["l"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["i2","j","h","g","f2","k"] - } + "initialConfiguration" : ["i1","j","h","g","f1","k"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["i2","j","h","g","f2","k"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["l"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["i2","j","h","g","f2","k"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/history/history5.scxml b/test/scxml-test-framework/test/history/history5.scxml index c2f497d..0b97e26 100644 --- a/test/scxml-test-framework/test/history/history5.scxml +++ b/test/scxml-test-framework/test/history/history5.scxml @@ -18,55 +18,56 @@ illustrates deep history with many parallel states --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> - - <parallel id="a"> - <history id="ha" type="deep"/> - - <parallel id="b"> - <parallel id="c"> - <parallel id="d"> - <parallel id="e"> - - <state id="i" initial="i1"> - <state id="i1"> - <transition target="i2" event="t1"/> - </state> - - <state id="i2"> - <transition target="l" event="t2"/> - </state> - </state> - - <state id="j"/> - </parallel> - - <state id="h"/> - </parallel> - - <state id="g"/> - </parallel> - - <state id="f" initial="f1"> - <state id="f1"> - <transition target="f2" event="t1"/> - </state> - - <state id="f2"> - </state> - </state> - </parallel> - - <state id="k"/> - </parallel> - - <state id="l"> - <transition target="ha" event="t3"/> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> + + <parallel id="a"> + <history id="ha" type="deep"> + <transition target="b"/> + </history> + + <parallel id="b"> + <parallel id="c"> + <parallel id="d"> + <parallel id="e"> + + <state id="i" initial="i1"> + <state id="i1"> + <transition target="i2" event="t1"/> + </state> + + <state id="i2"> + <transition target="l" event="t2"/> + </state> + </state> + + <state id="j"/> + </parallel> + + <state id="h"/> + </parallel> + + <state id="g"/> + </parallel> + + <state id="f" initial="f1"> + <state id="f1"> + <transition target="f2" event="t1"/> + </state> + + <state id="f2"> + </state> + </state> + </parallel> + + <state id="k"/> + </parallel> + + <state id="l"> + <transition target="ha" event="t3"/> + </state> </scxml> diff --git a/test/scxml-test-framework/test/history/history6.json b/test/scxml-test-framework/test/history/history6.json index 2face8d..ff5c582 100644 --- a/test/scxml-test-framework/test/history/history6.json +++ b/test/scxml-test-framework/test/history/history6.json @@ -1,27 +1,27 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b2"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["b3"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["a"] - }, - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b3"] - }, - { - "event" : { "name" : "t4" }, - "nextConfiguration" : ["success"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b2"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["b3"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["a"] + }, + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b3"] + }, + { + "event" : { "name" : "t4" }, + "nextConfiguration" : ["success"] + } + ] } diff --git a/test/scxml-test-framework/test/history/history6.scxml b/test/scxml-test-framework/test/history/history6.scxml index b726427..48cfd9a 100644 --- a/test/scxml-test-framework/test/history/history6.scxml +++ b/test/scxml-test-framework/test/history/history6.scxml @@ -15,56 +15,55 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> <datamodel> - <data id="x" expr="2"/> + <data id="x" expr="2"/> </datamodel> - <state id="a"> - <transition target="h" event="t1"/> - </state> + <state id="a"> + <transition target="h" event="t1"/> + </state> - <state id="b" initial="b1"> - <onentry> - <assign location="x" expr="x * 3"/> - <log expr="'b, x:' + x"/> - </onentry> + <state id="b" initial="b1"> + <onentry> + <assign location="x" expr="x * 3"/> + <log expr="'b, x:' + x"/> + </onentry> - <history id="h"> - <transition target="b2"/> - </history> + <history id="h"> + <transition target="b2"/> + </history> - <state id="b1"/> + <state id="b1"/> - <state id="b2"> + <state id="b2"> <onentry> <assign location="x" expr="x * 5"/> <log expr="'b2, x:' + x"/> </onentry> - <transition event="t2" target="b3"/> - </state> + <transition event="t2" target="b3"/> + </state> - <state id="b3"> + <state id="b3"> <onentry> <assign location="x" expr="x * 7"/> <log expr="'b3, x:' + x"/> </onentry> - <transition event="t3" target="a"/> - </state> + <transition event="t3" target="a"/> + </state> <!-- 4410 should be the value of x after the following sequence of enter actions: a, b, b2, b3, a, b, b3 --> - <transition event="t4" target="success" cond="x === 4410"/> - <!-- we make a special 'really-fail' state because of a particular bug in SCION I am trying to illustrate --> - <transition event="t4" target="really-fail" cond="x === 1470"/> - <!-- for everything else, we just fail --> - <transition event="t4" target="fail"/> - </state> + <transition event="t4" target="success" cond="x === 4410"/> + <!-- we make a special 'really-fail' state because of a particular bug in SCION I am trying to illustrate --> + <transition event="t4" target="really-fail" cond="x === 1470"/> + <!-- for everything else, we just fail --> + <transition event="t4" target="fail"/> + </state> <state id="success"/> diff --git a/test/scxml-test-framework/test/if-else/test0.json b/test/scxml-test-framework/test/if-else/test0.json index 8424ef5..0e49c49 100644 --- a/test/scxml-test-framework/test/if-else/test0.json +++ b/test/scxml-test-framework/test/if-else/test0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/if-else/test0.scxml b/test/scxml-test-framework/test/if-else/test0.scxml index 369222b..3dfc1a5 100644 --- a/test/scxml-test-framework/test/if-else/test0.scxml +++ b/test/scxml-test-framework/test/if-else/test0.scxml @@ -15,93 +15,92 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <datamodel> - <data id="a" expr="0"/> - </datamodel> - - <state id="a"> - <onentry> - <!-- test if --> - <log label="a" expr="a"/> - <if cond="a === 0"> - <assign location="a" expr="10"/> - <elseif cond="a === 10"/> - <assign location="a" expr="20"/> - <else/> - <assign location="a" expr="30"/> - </if> - <log label="a" expr="a"/> - </onentry> - - <transition event="t" target="b" cond="a === 10"> - <assign location="a" expr="a + 1"/> - </transition> - - <onexit> - <!-- test else --> - <log label="a" expr="a"/> - <if cond="a !== 10"> - <assign location="a" expr="a * 3"/> - <else/> - <assign location="a" expr="a * 2"/> - </if> - <log label="a" expr="a"/> - </onexit> - </state> - - <state id="b"> - <onentry> - <!-- test elseif --> - <log label="a" expr="a"/> - <if cond="a === 0"> - <assign location="a" expr="100"/> - <elseif cond="a === 21"/> - <assign location="a" expr="a + 2"/> - <assign location="a" expr="a + 3"/> - <else/> - <assign location="a" expr="200"/> - </if> - - <if cond="a === 26"> - <assign location="a" expr="a + 1"/> - </if> - - <if cond="a === 26"> - <elseif cond="a === 27"/> - <assign location="a" expr="a + 1"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="x" expr="0"/> + </datamodel> + + <state id="a"> + <onentry> + <!-- test if --> + <log label="x" expr="x"/> + <if cond="x === 0"> + <assign location="x" expr="10"/> + <elseif cond="x === 10"/> + <assign location="x" expr="20"/> <else/> - <assign location="a" expr="a + 10"/> - </if> + <assign location="x" expr="30"/> + </if> + <log label="x" expr="x"/> + </onentry> + + <transition event="t" target="b" cond="x === 10"> + <assign location="x" expr="x + 1"/> + </transition> + + <onexit> + <!-- test else --> + <log label="x" expr="x"/> + <if cond="x !== 10"> + <assign location="x" expr="x * 3"/> + <else/> + <assign location="x" expr="x * 2"/> + </if> + <log label="x" expr="x"/> + </onexit> + </state> + + <state id="b"> + <onentry> + <!-- test elseif --> + <log label="x" expr="x"/> + <if cond="x === 0"> + <assign location="x" expr="100"/> + <elseif cond="x === 21"/> + <assign location="x" expr="x + 2"/> + <assign location="x" expr="x + 3"/> + <else/> + <assign location="x" expr="200"/> + </if> + + <if cond="x === 26"> + <assign location="x" expr="x + 1"/> + </if> + + <if cond="x === 26"> + <elseif cond="x === 27"/> + <assign location="x" expr="x + 1"/> + <else/> + <assign location="x" expr="x + 10"/> + </if> - <if cond="a === 28"> - <assign location="a" expr="a + 12"/> - <if cond="a === 40"> - <assign location="a" expr="a + 10"/> + <if cond="x === 28"> + <assign location="x" expr="x + 12"/> + <if cond="x === 40"> + <assign location="x" expr="x + 10"/> </if> - </if> + </if> - <if cond="a === 50"> - <assign location="a" expr="a + 1"/> - <if cond="a !== 51"> + <if cond="x === 50"> + <assign location="x" expr="x + 1"/> + <if cond="x !== 51"> <else/> - <assign location="a" expr="a + 20"/> + <assign location="x" expr="x + 20"/> </if> - </if> + </if> - <log label="a" expr="a"/> - </onentry> + <log label="x" expr="x"/> + </onentry> - <transition target="c" cond="a === 71"/> - <transition target="f"/> - </state> + <transition target="c" cond="x === 71"/> + <transition target="f"/> + </state> - <state id="c"/> + <state id="c"/> - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/in/TestInPredicate.json b/test/scxml-test-framework/test/in/TestInPredicate.json index 5ef98f1..861374e 100644 --- a/test/scxml-test-framework/test/in/TestInPredicate.json +++ b/test/scxml-test-framework/test/in/TestInPredicate.json @@ -1,47 +1,47 @@ { - "initialConfiguration" : ["a1","a2"], - "events" : [ - { - "event" : { "name" : "t1" }, - "nextConfiguration" : ["b1","a2"] - }, - { - "event" : { "name" : "t2" }, - "nextConfiguration" : ["c1","a2"] - }, - { - "event" : { "name" : "t3" }, - "nextConfiguration" : ["d1","a2"] - }, - { - "event" : { "name" : "t4" }, - "nextConfiguration" : ["e1","a2"] - }, - { - "event" : { "name" : "t5" }, - "nextConfiguration" : ["f1","a2"] - }, - { - "event" : { "name" : "t6" }, - "nextConfiguration" : ["g1","b2"] - }, - { - "event" : { "name" : "t7" }, - "nextConfiguration" : ["h1","d2"] - }, - { - "event" : { "name" : "t8" }, - "nextConfiguration" : ["i1","d2"] - }, - { - "event" : { "name" : "t9" }, - "nextConfiguration" : ["j1","e2"] - }, - { - "event" : { "name" : "t10" }, - "nextConfiguration" : ["k1","e2"] - } - ] + "initialConfiguration" : ["a1","a2"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["b1","a2"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["c1","a2"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["d1","a2"] + }, + { + "event" : { "name" : "t4" }, + "nextConfiguration" : ["e1","a2"] + }, + { + "event" : { "name" : "t5" }, + "nextConfiguration" : ["f1","a2"] + }, + { + "event" : { "name" : "t6" }, + "nextConfiguration" : ["g1","b2"] + }, + { + "event" : { "name" : "t7" }, + "nextConfiguration" : ["h1","d2"] + }, + { + "event" : { "name" : "t8" }, + "nextConfiguration" : ["i1","d2"] + }, + { + "event" : { "name" : "t9" }, + "nextConfiguration" : ["j1","e2"] + }, + { + "event" : { "name" : "t10" }, + "nextConfiguration" : ["k1","e2"] + } + ] } diff --git a/test/scxml-test-framework/test/in/TestInPredicate.scxml b/test/scxml-test-framework/test/in/TestInPredicate.scxml index 4a6fedb..d89611b 100644 --- a/test/scxml-test-framework/test/in/TestInPredicate.scxml +++ b/test/scxml-test-framework/test/in/TestInPredicate.scxml @@ -19,94 +19,90 @@ This is to test the use of the In() predicate. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - name="root"> - - <initial> - <transition target="p1"/> - </initial> - - <parallel id="p1"> - - <state id="r1" initial="a1"> - <!-- sanity tests --> - <state id="a1"> - <transition event="t1" target="b1" cond="In('a1')"/> - </state> - - <state id="b1"> - <transition event="t2" target="c1" cond="In('r1')"/> - </state> - - <state id="c1"> - <transition event="t3" target="d1" cond="In('p1')"/> - </state> - - <!-- tests for failure --> - <state id="d1"> - <transition event="t4" target="e1" cond="!In('e2')"/> - </state> - - <state id="e1"> - <transition event="t5" target="f1" cond="!In('c2')"/> - </state> - - <!-- tests for success --> - <state id="f1"> - <transition event="t6" target="g1" cond="In('a2')"> - <raise event="gen1"/> - </transition> - </state> - - <state id="g1"> - <transition event="t7" target="h1" cond="In('b2')"> - <raise event="gen2"/> - </transition> - </state> - - <state id="h1"> - <transition event="t8" target="i1" cond="In('c2')"/> - </state> - - <state id="i1"> - <transition event="t9" target="j1" cond="In('d2')"> - <raise event="gen3"/> - </transition> - </state> - - <state id="j1"> - <transition event="t10" target="k1" cond="In('e2')"/> - </state> - - <state id="k1"/> - - </state> - - <state id="r2" initial="a2"> - <state id="a2"> - <transition event="gen1" target="b2"/> - </state> - - <state id="b2"> - <transition event="gen2" target="c2"/> - </state> - - <state id="c2"> - <initial> - <transition target="d2"/> - </initial> - - <state id="d2"> - <transition event="gen3" target="e2"/> - </state> - - <state id="e2"/> - </state> - </state> - - </parallel> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + initial="p1" + version="1.0"> + + <parallel id="p1"> + + <state id="r1" initial="a1"> + <!-- sanity tests --> + <state id="a1"> + <transition event="t1" target="b1" cond="In('a1')"/> + </state> + + <state id="b1"> + <transition event="t2" target="c1" cond="In('r1')"/> + </state> + + <state id="c1"> + <transition event="t3" target="d1" cond="In('p1')"/> + </state> + + <!-- tests for failure --> + <state id="d1"> + <transition event="t4" target="e1" cond="!In('e2')"/> + </state> + + <state id="e1"> + <transition event="t5" target="f1" cond="!In('c2')"/> + </state> + + <!-- tests for success --> + <state id="f1"> + <transition event="t6" target="g1" cond="In('a2')"> + <raise event="gen1"/> + </transition> + </state> + + <state id="g1"> + <transition event="t7" target="h1" cond="In('b2')"> + <raise event="gen2"/> + </transition> + </state> + + <state id="h1"> + <transition event="t8" target="i1" cond="In('c2')"/> + </state> + + <state id="i1"> + <transition event="t9" target="j1" cond="In('d2')"> + <raise event="gen3"/> + </transition> + </state> + + <state id="j1"> + <transition event="t10" target="k1" cond="In('e2')"/> + </state> + + <state id="k1"/> + + </state> + + <state id="r2" initial="a2"> + <state id="a2"> + <transition event="gen1" target="b2"/> + </state> + + <state id="b2"> + <transition event="gen2" target="c2"/> + </state> + + <state id="c2"> + <initial> + <transition target="d2"/> + </initial> + + <state id="d2"> + <transition event="gen3" target="e2"/> + </state> + + <state id="e2"/> + </state> + </state> + + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/internal-transitions/test0.json b/test/scxml-test-framework/test/internal-transitions/test0.json new file mode 100644 index 0000000..4808030 --- /dev/null +++ b/test/scxml-test-framework/test/internal-transitions/test0.json @@ -0,0 +1,17 @@ +{ + "initialConfiguration" : ["a1"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["a2"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["b"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["c"] + } + ] +} diff --git a/test/scxml-test-framework/test/internal-transitions/test0.scxml b/test/scxml-test-framework/test/internal-transitions/test0.scxml new file mode 100644 index 0000000..f9a620d --- /dev/null +++ b/test/scxml-test-framework/test/internal-transitions/test0.scxml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2011-2012 Jacob Beard, INFICON, and other SCION contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<scxml + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + datamodel="ecmascript"> + + <datamodel> + <data id="x" expr="0"/> + </datamodel> + + <transition event="*"> + <log label="x" expr="x"/> + </transition> + + <state id="a"> + <onentry> + <assign location="x" expr="x + 1"/> + </onentry> + + <onexit> + <assign location="x" expr="x + 1"/> + </onexit> + + <state id="a1"> + </state> + + <state id="a2"> + <!-- if we had exited and re-entered 'a', then x would be 3. but instead it's 1 --> + <transition target="b" event="t2" cond="x === 1" /> + </state> + + <transition target="a2" event="t1" type="internal" cond="x === 1"/> + </state> + + <state id="b"> + <transition target="c" event="t3" cond="x === 2" /> + </state> + + <state id="c"/> + +</scxml> diff --git a/test/scxml-test-framework/test/internal-transitions/test1.json b/test/scxml-test-framework/test/internal-transitions/test1.json new file mode 100644 index 0000000..d3e59ca --- /dev/null +++ b/test/scxml-test-framework/test/internal-transitions/test1.json @@ -0,0 +1,18 @@ +{ + "initialConfiguration" : ["a1", "b1"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["a2", "b1"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["c"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["d"] + } + ] +} + diff --git a/test/scxml-test-framework/test/internal-transitions/test1.scxml b/test/scxml-test-framework/test/internal-transitions/test1.scxml new file mode 100644 index 0000000..81e7cc3 --- /dev/null +++ b/test/scxml-test-framework/test/internal-transitions/test1.scxml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2011-2012 Jacob Beard, INFICON, and other SCION contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<scxml + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + datamodel="ecmascript"> + + <datamodel> + <data id="x" expr="0"/> + </datamodel> + + <parallel id="p"> + <onentry> + <assign location="x" expr="x + 1"/> + </onentry> + + <onexit> + <assign location="x" expr="x + 1"/> + </onexit> + + <state id="a"> + <onentry> + <assign location="x" expr="x + 1"/> + </onentry> + + <onexit> + <assign location="x" expr="x + 1"/> + </onexit> + + <state id="a1"> + <onentry> + <assign location="x" expr="x + 1"/> + </onentry> + + <onexit> + <assign location="x" expr="x + 1"/> + </onexit> + </state> + + <state id="a2"> + <onentry> + <assign location="x" expr="x + 1"/> + </onentry> + + <onexit> + <assign location="x" expr="x + 1"/> + </onexit> + + <!-- exited a1 (3 + 1 = 4), entered a2 (4 + 1 = 5) --> + <transition target="c" event="t2" cond="x === 5"/> + </state> + + <!-- entered p, a, a1 (x = 1 + 1 + 1 = 3) --> + <transition target="a2" event="t1" type="internal" cond="x === 3"/> + </state> + + <state id="b"> + <state id="b1"> + </state> + + <state id="b2"> + </state> + </state> + + </parallel> + + <state id="c"> + <!-- exited a2, a, p (5 + 1 + 1 + 1 = 8) --> + <transition target="d" event="t3" cond="x === 8"/> + </state> + + <state id="d"/> + +</scxml> + diff --git a/test/scxml-test-framework/test/more-parallel/test0.json b/test/scxml-test-framework/test/more-parallel/test0.json index 4de58d0..a316c55 100644 --- a/test/scxml-test-framework/test/more-parallel/test0.json +++ b/test/scxml-test-framework/test/more-parallel/test0.json @@ -1,10 +1,10 @@ { - "initialConfiguration" : ["a","b"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a","b"] - } + "initialConfiguration" : ["a","b"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a","b"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test0.scxml b/test/scxml-test-framework/test/more-parallel/test0.scxml index 460143d..19ab416 100644 --- a/test/scxml-test-framework/test/more-parallel/test0.scxml +++ b/test/scxml-test-framework/test/more-parallel/test0.scxml @@ -15,17 +15,17 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <parallel id="p"> - <state id="a"> - <transition target="a" event="t"/> - </state> + <parallel id="p"> + <state id="a"> + <transition target="a" event="t"/> + </state> - <state id="b"/> - </parallel> + <state id="b"/> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/more-parallel/test1.json b/test/scxml-test-framework/test/more-parallel/test1.json index 29793c8..0fb5018 100644 --- a/test/scxml-test-framework/test/more-parallel/test1.json +++ b/test/scxml-test-framework/test/more-parallel/test1.json @@ -1,10 +1,10 @@ { - "initialConfiguration" : ["a1","b1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1","b1"] - } + "initialConfiguration" : ["a1","b1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1","b1"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test1.scxml b/test/scxml-test-framework/test/more-parallel/test1.scxml index 94afb20..58eee87 100644 --- a/test/scxml-test-framework/test/more-parallel/test1.scxml +++ b/test/scxml-test-framework/test/more-parallel/test1.scxml @@ -15,28 +15,27 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <parallel id="p"> - <state id="a"> + <parallel id="p"> + <state id="a"> <transition event="t" target="a"/> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> - <state id="b"> + <state id="b"> - <state id="b1"/> + <state id="b1"/> - <state id="b2"/> - </state> - </parallel> + <state id="b2"/> + </state> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/more-parallel/test10.json b/test/scxml-test-framework/test/more-parallel/test10.json new file mode 100644 index 0000000..b02dc37 --- /dev/null +++ b/test/scxml-test-framework/test/more-parallel/test10.json @@ -0,0 +1,17 @@ +{ + "initialConfiguration" : ["a","b"], + "events" : [ + { + "event" : { "name" : "t1" }, + "nextConfiguration" : ["a","b"] + }, + { + "event" : { "name" : "t2" }, + "nextConfiguration" : ["c"] + }, + { + "event" : { "name" : "t3" }, + "nextConfiguration" : ["d"] + } + ] +} diff --git a/test/scxml-test-framework/test/more-parallel/test10.scxml b/test/scxml-test-framework/test/more-parallel/test10.scxml new file mode 100644 index 0000000..1d6f371 --- /dev/null +++ b/test/scxml-test-framework/test/more-parallel/test10.scxml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2011-2012 Jacob Beard, INFICON, and other SCION contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<scxml + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="x" expr="0"/> + </datamodel> + + <parallel id="p"> + <onentry> + <assign location="x" expr="x +1"/> + </onentry> + <onexit> + <assign location="x" expr="x + 1"/> + </onexit> + + <state id="a"> + <onentry> + <assign location="x" expr="x + 1"/> + </onentry> + <onexit> + <assign location="x" expr="x + 1"/> + </onexit> + + <!-- we've entered p, a, so x === 2 here --> + + <transition target="a" event="t1" cond="x === 2"/> + </state> + + <state id="b"/> + + <!-- we've exited and re-entered p, a, so x === 6 here --> + <transition target="c" event="t2" cond="x === 6"/> + </parallel> + + <state id="c"> + <!-- we've exited p, a here, so x === 8 --> + <transition target="d" event="t3" cond="x === 8"/> + </state> + + <state id="d"/> + +</scxml> + + + diff --git a/test/scxml-test-framework/test/more-parallel/test2.json b/test/scxml-test-framework/test/more-parallel/test2.json index f024462..afcef7a 100644 --- a/test/scxml-test-framework/test/more-parallel/test2.json +++ b/test/scxml-test-framework/test/more-parallel/test2.json @@ -1,10 +1,10 @@ { - "initialConfiguration" : ["a1","b1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1","b2"] - } + "initialConfiguration" : ["a1","b1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1","b2"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test2.scxml b/test/scxml-test-framework/test/more-parallel/test2.scxml index 96d54fd..2adbb3b 100644 --- a/test/scxml-test-framework/test/more-parallel/test2.scxml +++ b/test/scxml-test-framework/test/more-parallel/test2.scxml @@ -15,30 +15,29 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <parallel id="p"> - <state id="a"> + <parallel id="p"> + <state id="a"> <transition event="t" target="a"/> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> - <state id="b"> + <state id="b"> - <state id="b1"> - <transition event="t" target="b2"/> - </state> + <state id="b1"> + <transition event="t" target="b2"/> + </state> - <state id="b2"/> - </state> - </parallel> + <state id="b2"/> + </state> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/more-parallel/test3.json b/test/scxml-test-framework/test/more-parallel/test3.json index c2277fa..bc31df4 100644 --- a/test/scxml-test-framework/test/more-parallel/test3.json +++ b/test/scxml-test-framework/test/more-parallel/test3.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a1","b1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2","b2"] - } + "initialConfiguration" : ["a1","b1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1","b2"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test3.scxml b/test/scxml-test-framework/test/more-parallel/test3.scxml index e959293..14d613e 100644 --- a/test/scxml-test-framework/test/more-parallel/test3.scxml +++ b/test/scxml-test-framework/test/more-parallel/test3.scxml @@ -15,34 +15,29 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" > - <parallel id="p"> - <state id="a"> + <parallel id="p"> + <state id="a"> <transition event="t" target="a2"/> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> - <state id="b"> + <state id="b"> - <state id="b1"> - <transition event="t" target="b2"/> - </state> + <state id="b1"> + <transition event="t" target="b2"/> + </state> - <state id="b2"/> - </state> - </parallel> + <state id="b2"/> + </state> + </parallel> </scxml> - - - - diff --git a/test/scxml-test-framework/test/more-parallel/test4.json b/test/scxml-test-framework/test/more-parallel/test4.json index 8335a57..3f05f83 100644 --- a/test/scxml-test-framework/test/more-parallel/test4.json +++ b/test/scxml-test-framework/test/more-parallel/test4.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["a1","b1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1","b1"] - } + "initialConfiguration" : ["a1","b1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1","b1"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test4.scxml b/test/scxml-test-framework/test/more-parallel/test4.scxml index 3818e1b..b211cad 100644 --- a/test/scxml-test-framework/test/more-parallel/test4.scxml +++ b/test/scxml-test-framework/test/more-parallel/test4.scxml @@ -15,30 +15,29 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <parallel id="p"> - <state id="a"> + <parallel id="p"> + <state id="a"> <transition event="t" target="a"/> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> - <state id="b"> + <state id="b"> <transition event="t" target="b"/> - <state id="b1"/> + <state id="b1"/> - <state id="b2"/> - </state> - </parallel> + <state id="b2"/> + </state> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/more-parallel/test5.json b/test/scxml-test-framework/test/more-parallel/test5.json index 16791aa..b07bacf 100644 --- a/test/scxml-test-framework/test/more-parallel/test5.json +++ b/test/scxml-test-framework/test/more-parallel/test5.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["a1","b1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2","b2"] - } - - ] + "initialConfiguration" : ["a1","b1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a2","b1"] + } + + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test5.scxml b/test/scxml-test-framework/test/more-parallel/test5.scxml index df2fc78..7f4c7ab 100644 --- a/test/scxml-test-framework/test/more-parallel/test5.scxml +++ b/test/scxml-test-framework/test/more-parallel/test5.scxml @@ -15,30 +15,29 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <parallel id="p"> - <state id="a"> + <parallel id="p"> + <state id="a"> <transition event="t" target="a2"/> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> - <state id="b"> + <state id="b"> <transition event="t" target="b2"/> - <state id="b1"/> + <state id="b1"/> - <state id="b2"/> - </state> - </parallel> + <state id="b2"/> + </state> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/more-parallel/test6.json b/test/scxml-test-framework/test/more-parallel/test6.json index 17a169b..9e33fe5 100644 --- a/test/scxml-test-framework/test/more-parallel/test6.json +++ b/test/scxml-test-framework/test/more-parallel/test6.json @@ -1,10 +1,10 @@ { - "initialConfiguration" : ["a11","b11"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a22","b12"] - } + "initialConfiguration" : ["a11","b11"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a11","b12"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test6.scxml b/test/scxml-test-framework/test/more-parallel/test6.scxml index 35be417..efe2442 100644 --- a/test/scxml-test-framework/test/more-parallel/test6.scxml +++ b/test/scxml-test-framework/test/more-parallel/test6.scxml @@ -15,42 +15,41 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <parallel id="p"> - <state id="a"> + <parallel id="p"> + <state id="a"> <transition event="t" target="a22"/> - <state id="a1"> - <state id="a11"/> - <state id="a12"/> - </state> + <state id="a1"> + <state id="a11"/> + <state id="a12"/> + </state> - <state id="a2"> - <state id="a21"/> - <state id="a22"/> - </state> - </state> + <state id="a2"> + <state id="a21"/> + <state id="a22"/> + </state> + </state> - <state id="b"> + <state id="b"> - <state id="b1"> - <state id="b11"> + <state id="b1"> + <state id="b11"> <transition event="t" target="b12"/> - </state> - <state id="b12"/> - </state> - - <state id="b2"> - <state id="b21"/> - <state id="b22"/> - </state> - </state> - </parallel> + </state> + <state id="b12"/> + </state> + + <state id="b2"> + <state id="b21"/> + <state id="b22"/> + </state> + </state> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/more-parallel/test7.json b/test/scxml-test-framework/test/more-parallel/test7.json index 12c66d9..db9e53f 100644 --- a/test/scxml-test-framework/test/more-parallel/test7.json +++ b/test/scxml-test-framework/test/more-parallel/test7.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a11","b11"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a22","b22"] - } + "initialConfiguration" : ["a11","b11"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a22","b11"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test7.scxml b/test/scxml-test-framework/test/more-parallel/test7.scxml index 6050d0e..dcaee1e 100644 --- a/test/scxml-test-framework/test/more-parallel/test7.scxml +++ b/test/scxml-test-framework/test/more-parallel/test7.scxml @@ -15,42 +15,41 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <parallel id="p"> - <state id="a"> + <parallel id="p"> + <state id="a"> <transition event="t" target="a22"/> - <state id="a1"> - <state id="a11"/> - <state id="a12"/> - </state> + <state id="a1"> + <state id="a11"/> + <state id="a12"/> + </state> - <state id="a2"> - <state id="a21"/> - <state id="a22"/> - </state> - </state> + <state id="a2"> + <state id="a21"/> + <state id="a22"/> + </state> + </state> - <state id="b"> + <state id="b"> <transition event="t" target="b22"/> - <state id="b1"> - <state id="b11"/> - <state id="b12"/> - </state> - - <state id="b2"> - <state id="b21"/> - <state id="b22"/> - </state> - </state> - </parallel> + <state id="b1"> + <state id="b11"/> + <state id="b12"/> + </state> + + <state id="b2"> + <state id="b21"/> + <state id="b22"/> + </state> + </state> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/more-parallel/test8.json b/test/scxml-test-framework/test/more-parallel/test8.json index 26269b8..d36bc3c 100644 --- a/test/scxml-test-framework/test/more-parallel/test8.json +++ b/test/scxml-test-framework/test/more-parallel/test8.json @@ -1,10 +1,10 @@ { - "initialConfiguration" : ["x"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a22","b11"] - } + "initialConfiguration" : ["x"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a22","b11"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test8.scxml b/test/scxml-test-framework/test/more-parallel/test8.scxml index 03f492a..1c6f60c 100644 --- a/test/scxml-test-framework/test/more-parallel/test8.scxml +++ b/test/scxml-test-framework/test/more-parallel/test8.scxml @@ -15,39 +15,38 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + <state id="x"> <transition event="t" target="a22"/> </state> - <parallel id="p"> - <state id="a"> - <state id="a1"> - <state id="a11"/> - <state id="a12"/> - </state> - - <state id="a2"> - <state id="a21"/> - <state id="a22"/> - </state> - </state> - - <state id="b"> - - <state id="b1"> - <state id="b11"/> - <state id="b12"/> - </state> - - <state id="b2"> - <state id="b21"/> - <state id="b22"/> - </state> - </state> - </parallel> + <parallel id="p"> + <state id="a"> + <state id="a1"> + <state id="a11"/> + <state id="a12"/> + </state> + + <state id="a2"> + <state id="a21"/> + <state id="a22"/> + </state> + </state> + + <state id="b"> + + <state id="b1"> + <state id="b11"/> + <state id="b12"/> + </state> + + <state id="b2"> + <state id="b21"/> + <state id="b22"/> + </state> + </state> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/more-parallel/test9.json b/test/scxml-test-framework/test/more-parallel/test9.json index b435564..142f1f7 100644 --- a/test/scxml-test-framework/test/more-parallel/test9.json +++ b/test/scxml-test-framework/test/more-parallel/test9.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["x"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a22","b22"] - } + "initialConfiguration" : ["x"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a22","b22"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/more-parallel/test9.scxml b/test/scxml-test-framework/test/more-parallel/test9.scxml index 9223c95..0e95f17 100644 --- a/test/scxml-test-framework/test/more-parallel/test9.scxml +++ b/test/scxml-test-framework/test/more-parallel/test9.scxml @@ -15,40 +15,39 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + <state id="x"> <transition event="t" target="a22 b22"/> </state> - <parallel id="p"> - <state id="a"> - <state id="a1"> - <state id="a11"/> - <state id="a12"/> - </state> - - <state id="a2"> - <state id="a21"/> - <state id="a22"/> - </state> - </state> - - <state id="b"> - - <state id="b1"> - <state id="b11"/> - <state id="b12"/> - </state> - - <state id="b2"> - <state id="b21"/> - <state id="b22"/> - </state> - </state> - </parallel> + <parallel id="p"> + <state id="a"> + <state id="a1"> + <state id="a11"/> + <state id="a12"/> + </state> + + <state id="a2"> + <state id="a21"/> + <state id="a22"/> + </state> + </state> + + <state id="b"> + + <state id="b1"> + <state id="b11"/> + <state id="b12"/> + </state> + + <state id="b2"> + <state id="b21"/> + <state id="b22"/> + </state> + </state> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/multiple-events-per-transition/test1.json b/test/scxml-test-framework/test/multiple-events-per-transition/test1.json index aa3a778..155aa6f 100644 --- a/test/scxml-test-framework/test/multiple-events-per-transition/test1.json +++ b/test/scxml-test-framework/test/multiple-events-per-transition/test1.json @@ -1,19 +1,19 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "foo" }, - "nextConfiguration" : ["b"] - }, - { - "event" : { "name" : "bar" }, - "nextConfiguration" : ["c"] - }, - { - "event" : { "name" : "bat" }, - "nextConfiguration" : ["d"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "foo" }, + "nextConfiguration" : ["b"] + }, + { + "event" : { "name" : "bar" }, + "nextConfiguration" : ["c"] + }, + { + "event" : { "name" : "bat" }, + "nextConfiguration" : ["d"] + } + ] } diff --git a/test/scxml-test-framework/test/multiple-events-per-transition/test1.scxml b/test/scxml-test-framework/test/multiple-events-per-transition/test1.scxml index fdea437..3ee5fa2 100644 --- a/test/scxml-test-framework/test/multiple-events-per-transition/test1.scxml +++ b/test/scxml-test-framework/test/multiple-events-per-transition/test1.scxml @@ -15,22 +15,22 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <state id="a"> - <transition target="b" event="foo bar bat"/> - </state> + <state id="a"> + <transition target="b" event="foo bar bat"/> + </state> - <state id="b"> - <transition target="c" event="foo bar bat"/> - </state> + <state id="b"> + <transition target="c" event="foo bar bat"/> + </state> - <state id="c"> - <transition target="d" event="foo bar bat"/> - </state> + <state id="c"> + <transition target="d" event="foo bar bat"/> + </state> - <state id="d"/> + <state id="d"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test0.json b/test/scxml-test-framework/test/parallel+interrupt/test0.json index f8c3982..95b109d 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test0.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test0.json @@ -1,10 +1,10 @@ { - "initialConfiguration" : ["c","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1"] - } + "initialConfiguration" : ["c","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test0.scxml b/test/scxml-test-framework/test/parallel+interrupt/test0.scxml index 5684784..e8072f0 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test0.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test0.scxml @@ -19,26 +19,25 @@ orthogonal preemption - inner or states interrupt one-another in our semantics, source state is at the same level of hierarchy, so document order will resolve conflict. a1 will win. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c"> - <transition event="t" target="a1"/> - </state> + <parallel id="b"> + <state id="c"> + <transition event="t" target="a1"/> + </state> - <state id="d"> - <transition event="t" target="a2"/> - </state> + <state id="d"> + <transition event="t" target="a2"/> + </state> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test1.json b/test/scxml-test-framework/test/parallel+interrupt/test1.json index 09312a0..723901c 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test1.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["c1","d1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c2","d1"] - } + "initialConfiguration" : ["c1","d1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c2","d1"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test1.scxml b/test/scxml-test-framework/test/parallel+interrupt/test1.scxml index 8dd8661..83ad119 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test1.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test1.scxml @@ -19,29 +19,28 @@ orthogonal preemption - transition originating at inner OR state interrupts tran first OR state should win, as the transitions originate at the same level of hierarchy, and wins by document order --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> - - <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="c2"/> - </state> - - <state id="c2"/> - </state> - - <state id="d" initial="d1"> - <state id="d1"> - <transition event="t" target="a1"/> - </state> - </state> - - </parallel> - - <state id="a1"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> + + <parallel id="b"> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="c2"/> + </state> + + <state id="c2"/> + </state> + + <state id="d" initial="d1"> + <state id="d1"> + <transition event="t" target="a1"/> + </state> + </state> + + </parallel> + + <state id="a1"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test10.json b/test/scxml-test-framework/test/parallel+interrupt/test10.json index 4db82db..cc1a4ff 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test10.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test10.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["b1","b2"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c1","c2"] - } - - ] + "initialConfiguration" : ["b1","b2"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c1","c2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test10.scxml b/test/scxml-test-framework/test/parallel+interrupt/test10.scxml index bf84721..b68c38e 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test10.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test10.scxml @@ -20,32 +20,31 @@ initial: [b1,b2] after t: [c1,c2] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <state id="a" initial="b"> + <state id="a" initial="b"> - <transition event="t" target="c"/> + <transition event="t" target="c"/> - <parallel id="b"> - <state id="b1"> - </state> + <parallel id="b"> + <state id="b1"> + </state> - <state id="b2"> - </state> - </parallel> + <state id="b2"> + </state> + </parallel> - <parallel id="c"> - <state id="c1"> - </state> + <parallel id="c"> + <state id="c1"> + </state> - <state id="c2"> - </state> - </parallel> - </state> + <state id="c2"> + </state> + </parallel> + </state> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test11.json b/test/scxml-test-framework/test/parallel+interrupt/test11.json index 3d4a03b..19f29fb 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test11.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test11.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["b1","b2"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["d"] - } - - ] + "initialConfiguration" : ["b1","b2"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["d"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test11.scxml b/test/scxml-test-framework/test/parallel+interrupt/test11.scxml index 0ba2be3..c098dc0 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test11.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test11.scxml @@ -4,35 +4,34 @@ initial: [b1,b2] after t: [d] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <state id="a" initial="b"> + <state id="a" initial="b"> - <parallel id="b"> - <state id="b1"> - <transition event="t" target="d"/> - </state> + <parallel id="b"> + <state id="b1"> + <transition event="t" target="d"/> + </state> - <state id="b2"> - <transition event="t" target="c"/> - </state> + <state id="b2"> + <transition event="t" target="c"/> + </state> - </parallel> + </parallel> - <parallel id="c"> - <state id="c1"> - </state> + <parallel id="c"> + <state id="c1"> + </state> - <state id="c2"> - </state> - </parallel> + <state id="c2"> + </state> + </parallel> - </state> + </state> - <state id="d"/> + <state id="d"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test12.json b/test/scxml-test-framework/test/parallel+interrupt/test12.json index c1d01f4..93a1a43 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test12.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test12.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["b1","b2"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c1","c2"] - } - - ] + "initialConfiguration" : ["b1","b2"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c1","c2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test12.scxml b/test/scxml-test-framework/test/parallel+interrupt/test12.scxml index 8f7a66a..f7025a4 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test12.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test12.scxml @@ -19,35 +19,34 @@ initial: [b1,b2] after t: [c1,c2] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <state id="a" initial="b"> - <parallel id="b"> - <state id="b1"> - <transition event="t" target="c"/> - </state> + <state id="a" initial="b"> + <parallel id="b"> + <state id="b1"> + <transition event="t" target="c"/> + </state> - <state id="b2"> - <transition event="t" target="d"/> - </state> + <state id="b2"> + <transition event="t" target="d"/> + </state> - </parallel> + </parallel> - <parallel id="c"> - <state id="c1"> - </state> + <parallel id="c"> + <state id="c1"> + </state> - <state id="c2"> - </state> - </parallel> + <state id="c2"> + </state> + </parallel> - </state> + </state> - <state id="d"/> + <state id="d"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test13.json b/test/scxml-test-framework/test/parallel+interrupt/test13.json index b97af4f..f84429c 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test13.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test13.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["b1","b2"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c1","c2"] - } - - ] + "initialConfiguration" : ["b1","b2"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c1","c2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test13.scxml b/test/scxml-test-framework/test/parallel+interrupt/test13.scxml index a0fcf54..5e87469 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test13.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test13.scxml @@ -19,37 +19,36 @@ initial: [b1,b2] after t: [c1,c2] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <state id="a" initial="b"> + <state id="a" initial="b"> - <parallel id="b"> - <state id="b1"> - <transition event="t" target="c"/> - </state> + <parallel id="b"> + <state id="b1"> + <transition event="t" target="c"/> + </state> - <state id="b2"> - </state> + <state id="b2"> + </state> - <transition event="t" target="d"/> + <transition event="t" target="d"/> - </parallel> + </parallel> - <parallel id="c"> - <state id="c1"> - </state> + <parallel id="c"> + <state id="c1"> + </state> - <state id="c2"> - </state> - </parallel> + <state id="c2"> + </state> + </parallel> - </state> + </state> - <state id="d"/> + <state id="d"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test14.json b/test/scxml-test-framework/test/parallel+interrupt/test14.json index cd93b1d..f3c1994 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test14.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test14.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["i1","j","h","g","f1","k"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["l"] - } - - ] + "initialConfiguration" : ["i1","j","h","g","f1","k"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["l"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test14.scxml b/test/scxml-test-framework/test/parallel+interrupt/test14.scxml index 098ecf1..dead195 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test14.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test14.scxml @@ -19,50 +19,49 @@ initial: [i1,j,h,g,f1,i1,k] after t: [l] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> - - <parallel id="a"> - <parallel id="b"> - <parallel id="c"> - <parallel id="d"> - <parallel id="e"> - - <state id="i" initial="i1"> - <state id="i1"> - <transition target="l" event="t"/> - </state> - - <state id="i2"> - </state> - </state> - - <state id="j"/> - </parallel> - - <state id="h"/> - </parallel> - - <state id="g"/> - </parallel> - - <state id="f" initial="f1"> - <state id="f1"> - <transition target="f2" event="t"/> - </state> - - <state id="f2"> - </state> - </state> - </parallel> - - <state id="k"/> - </parallel> - - <state id="l"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> + + <parallel id="a"> + <parallel id="b"> + <parallel id="c"> + <parallel id="d"> + <parallel id="e"> + + <state id="i" initial="i1"> + <state id="i1"> + <transition target="l" event="t"/> + </state> + + <state id="i2"> + </state> + </state> + + <state id="j"/> + </parallel> + + <state id="h"/> + </parallel> + + <state id="g"/> + </parallel> + + <state id="f" initial="f1"> + <state id="f1"> + <transition target="f2" event="t"/> + </state> + + <state id="f2"> + </state> + </state> + </parallel> + + <state id="k"/> + </parallel> + + <state id="l"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test15.json b/test/scxml-test-framework/test/parallel+interrupt/test15.json index 6737f6e..e3d8a56 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test15.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test15.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["i1","j","h","g","f1","k"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["i2","j","h","g","f1","k"] - } - - ] + "initialConfiguration" : ["i1","j","h","g","f1","k"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["i2","j","h","g","f1","k"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test15.scxml b/test/scxml-test-framework/test/parallel+interrupt/test15.scxml index d9bf6f8..2c2fc67 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test15.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test15.scxml @@ -19,48 +19,47 @@ initial: [i1,j,h,g,f1,i1,k] after t: ["i2","j","h","g","f1","k"] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> - <parallel id="a"> - <parallel id="b"> - <parallel id="c"> - <parallel id="d"> - <parallel id="e"> + <parallel id="a"> + <parallel id="b"> + <parallel id="c"> + <parallel id="d"> + <parallel id="e"> - <state id="i" initial="i1"> - <state id="i1"> - <transition target="i2" event="t"/> - </state> + <state id="i" initial="i1"> + <state id="i1"> + <transition target="i2" event="t"/> + </state> - <state id="i2"> - </state> - </state> + <state id="i2"> + </state> + </state> - <state id="j"/> - </parallel> + <state id="j"/> + </parallel> - <state id="h"/> - </parallel> + <state id="h"/> + </parallel> - <state id="g"/> - </parallel> + <state id="g"/> + </parallel> - <state id="f" initial="f1"> - <state id="f1"> - <transition target="l" event="t"/> - </state> + <state id="f" initial="f1"> + <state id="f1"> + <transition target="l" event="t"/> + </state> - <state id="f2"> - </state> - </state> - </parallel> + <state id="f2"> + </state> + </state> + </parallel> - <state id="k"/> - </parallel> + <state id="k"/> + </parallel> - <state id="l"/> + <state id="l"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test16.json b/test/scxml-test-framework/test/parallel+interrupt/test16.json index 3e7a63f..b73fce9 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test16.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test16.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1"] - } - - ] + "initialConfiguration" : ["c","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test16.scxml b/test/scxml-test-framework/test/parallel+interrupt/test16.scxml index 3312fa8..d7ec9fc 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test16.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test16.scxml @@ -20,27 +20,26 @@ illustrates target interrupt in our semantics, source state is at the same level of hierarchy, so document order will resolve conflict. a1 will win. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c"> - <transition event="t" target="a"/> - </state> + <parallel id="b"> + <state id="c"> + <transition event="t" target="a"/> + </state> - <state id="d"> - <transition event="t" target="a2"/> - </state> + <state id="d"> + <transition event="t" target="a2"/> + </state> - </parallel> + </parallel> - <state id="a" initial="a1"> - <state id="a1"/> + <state id="a" initial="a1"> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test17.json b/test/scxml-test-framework/test/parallel+interrupt/test17.json index 586da7a..5b9f8af 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test17.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test17.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2"] - } - - ] + "initialConfiguration" : ["c","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test17.scxml b/test/scxml-test-framework/test/parallel+interrupt/test17.scxml index 944c2b0..4af40c5 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test17.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test17.scxml @@ -20,28 +20,27 @@ illustrates target interrupt in our semantics, source state is at the same level of hierarchy, so document order will resolve conflict. a1 will win. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c"> - <transition event="t" target="a2"/> - </state> + <parallel id="b"> + <state id="c"> + <transition event="t" target="a2"/> + </state> - <state id="d"> - <transition event="t" target="a"/> - </state> + <state id="d"> + <transition event="t" target="a"/> + </state> - </parallel> + </parallel> - <state id="a" initial="a1"> - <state id="a1"/> + <state id="a" initial="a1"> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test18.json b/test/scxml-test-framework/test/parallel+interrupt/test18.json index 46b284f..55abbba 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test18.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test18.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2"] - } - - ] + "initialConfiguration" : ["c","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test18.scxml b/test/scxml-test-framework/test/parallel+interrupt/test18.scxml index 2765d52..e0d14a8 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test18.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test18.scxml @@ -16,25 +16,24 @@ --> <!-- orthogonal preemption - outer and state interrupts inner or state --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c"/> + <parallel id="b"> + <state id="c"/> - <state id="d"> - <transition event="t" target="a2"/> - </state> + <state id="d"> + <transition event="t" target="a2"/> + </state> - <transition event="t" target="a1"/> - </parallel> + <transition event="t" target="a1"/> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test19.json b/test/scxml-test-framework/test/parallel+interrupt/test19.json index e899562..9c0458f 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test19.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test19.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c1","d1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c2","d2"] - } - - ] + "initialConfiguration" : ["c1","d1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c2","d2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test19.scxml b/test/scxml-test-framework/test/parallel+interrupt/test19.scxml index 1eee200..d5c8967 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test19.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test19.scxml @@ -16,34 +16,33 @@ --> <!-- orthogonal preemption - two transitions originating at internal OR states are interrupted by a transition originating at outer AND state --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="c2"/> - </state> + <parallel id="b"> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="c2"/> + </state> - <state id="c2"/> - </state> + <state id="c2"/> + </state> - <state id="d" initial="d1"> - <state id="d1"> - <transition event="t" target="d2"/> - </state> + <state id="d" initial="d1"> + <state id="d1"> + <transition event="t" target="d2"/> + </state> - <state id="d2"/> - </state> + <state id="d2"/> + </state> - <transition event="t" target="a1" /> + <transition event="t" target="a1" /> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test2.json b/test/scxml-test-framework/test/parallel+interrupt/test2.json index 5d1076a..e3b3b9d 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test2.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test2.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c1","d1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1"] - } + "initialConfiguration" : ["c1","d1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test2.scxml b/test/scxml-test-framework/test/parallel+interrupt/test2.scxml index 975431d..1c3757f 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test2.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test2.scxml @@ -19,34 +19,33 @@ orthogonal preemption - transition originating at inner OR state interrupts tran again, first OR state should win, as the transitions originate at the same level of hierarchy, and wins by document order --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> + <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="a1"/> - </state> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="a1"/> + </state> - <state id="c2"/> - </state> + <state id="c2"/> + </state> - <state id="d" initial="d1"> - <state id="d1"> - <transition event="t" target="d2"/> - </state> + <state id="d" initial="d1"> + <state id="d1"> + <transition event="t" target="d2"/> + </state> - <state id="d2"/> - </state> + <state id="d2"/> + </state> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test20.json b/test/scxml-test-framework/test/parallel+interrupt/test20.json index c29b31d..470a986 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test20.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test20.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c1","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c2","d"] - } - - ] + "initialConfiguration" : ["c1","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c2","d"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test20.scxml b/test/scxml-test-framework/test/parallel+interrupt/test20.scxml index 1e2473c..2066be5 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test20.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test20.scxml @@ -18,32 +18,31 @@ here we have multiple interrupt conflicts, originating from d and a2. transition from c1 will win, for same reasons listed above --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="c2"/> - </state> + <parallel id="b"> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="c2"/> + </state> - <state id="c2"/> - </state> + <state id="c2"/> + </state> - <state id="d"> - <transition event="t" target="a1"/> - </state> + <state id="d"> + <transition event="t" target="a1"/> + </state> - <transition event="t" target="a2"/> + <transition event="t" target="a2"/> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test21.json b/test/scxml-test-framework/test/parallel+interrupt/test21.json index 99f729c..15fb75b 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test21.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test21.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c","d1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c","d2"] - } - - ] + "initialConfiguration" : ["c","d1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c","d2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test21.scxml b/test/scxml-test-framework/test/parallel+interrupt/test21.scxml index 55bdcdf..4e66fda 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test21.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test21.scxml @@ -18,31 +18,30 @@ here we have multiple interrupt conflicts, originating from d and a2. transition from d1 will win, for same reasons listed above --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> + <parallel id="b"> - <state id="c"> - <transition event="t" target="a1"/> - </state> + <state id="c"> + <transition event="t" target="a1"/> + </state> - <state id="d" initial="d1"> - <state id="d1"> - <transition event="t" target="d2"/> - </state> + <state id="d" initial="d1"> + <state id="d1"> + <transition event="t" target="d2"/> + </state> - <state id="d2"/> - </state> + <state id="d2"/> + </state> - <transition event="t" target="a2"/> + <transition event="t" target="a2"/> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test22.json b/test/scxml-test-framework/test/parallel+interrupt/test22.json index d3434f7..4d7bf5a 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test22.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test22.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c1","d1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c2","d2"] - } - - ] + "initialConfiguration" : ["c1","d1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c2","d2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test22.scxml b/test/scxml-test-framework/test/parallel+interrupt/test22.scxml index b313fa5..2e71d50 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test22.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test22.scxml @@ -18,33 +18,32 @@ here we have multiple interrupt conflicts, originating from d and a2. transitions from c1 and d1 will win, for same reasons listed above --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="c2"/> - </state> + <parallel id="b"> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="c2"/> + </state> - <state id="c2"/> - </state> + <state id="c2"/> + </state> - <state id="d" initial="d1"> - <state id="d1"> - <transition event="t" target="d2"/> - </state> + <state id="d" initial="d1"> + <state id="d1"> + <transition event="t" target="d2"/> + </state> - <state id="d2"/> - </state> + <state id="d2"/> + </state> - <transition event="t" target="a1" /> + <transition event="t" target="a1" /> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test23.json b/test/scxml-test-framework/test/parallel+interrupt/test23.json index 7321890..db53da4 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test23.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test23.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2"] - } - - ] + "initialConfiguration" : ["c","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test23.scxml b/test/scxml-test-framework/test/parallel+interrupt/test23.scxml index e5b24e7..04245a6 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test23.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test23.scxml @@ -16,25 +16,24 @@ --> <!-- orthogonal preemption - outer and state interrupts inner or state --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c"/> + <parallel id="b"> + <state id="c"/> - <state id="d"> - <transition event="t" target="a2"/> - </state> + <state id="d"> + <transition event="t" target="a2"/> + </state> - <transition event="t" target="a1"/> - </parallel> + <transition event="t" target="a1"/> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test24.json b/test/scxml-test-framework/test/parallel+interrupt/test24.json index 90c50b5..d1c8f8b 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test24.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test24.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c1","d1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c2","d2"] - } - - ] + "initialConfiguration" : ["c1","d1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c2","d2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test24.scxml b/test/scxml-test-framework/test/parallel+interrupt/test24.scxml index 1faa9ce..6534d68 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test24.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test24.scxml @@ -16,34 +16,33 @@ --> <!-- orthogonal preemption - two transitions originating at internal OR states are interrupted by a transition originating at outer AND state --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="c2"/> - </state> + <parallel id="b"> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="c2"/> + </state> - <state id="c2"/> - </state> + <state id="c2"/> + </state> - <state id="d" initial="d1"> - <state id="d1"> - <transition event="t" target="d2"/> - </state> + <state id="d" initial="d1"> + <state id="d1"> + <transition event="t" target="d2"/> + </state> - <state id="d2"/> - </state> + <state id="d2"/> + </state> - <transition event="t" target="a1" /> + <transition event="t" target="a1" /> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test25.json b/test/scxml-test-framework/test/parallel+interrupt/test25.json index 444f24e..7c380c8 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test25.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test25.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c1","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c2","d"] - } - - ] + "initialConfiguration" : ["c1","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c2","d"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test25.scxml b/test/scxml-test-framework/test/parallel+interrupt/test25.scxml index add7ebd..2084c90 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test25.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test25.scxml @@ -18,32 +18,31 @@ here we have multiple interrupt conflicts, originating from d and b. transition from c1 will win, for same reasons listed above --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="c2"/> - </state> + <parallel id="b"> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="c2"/> + </state> - <state id="c2"/> - </state> + <state id="c2"/> + </state> - <state id="d"> - <transition event="t" target="a1"/> - </state> + <state id="d"> + <transition event="t" target="a1"/> + </state> - <transition event="t" target="a2"/> + <transition event="t" target="a2"/> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test26.json b/test/scxml-test-framework/test/parallel+interrupt/test26.json index e6740f3..89e21a1 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test26.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test26.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c","d1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c","d2"] - } - - ] + "initialConfiguration" : ["c","d1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c","d2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test26.scxml b/test/scxml-test-framework/test/parallel+interrupt/test26.scxml index 1a5ab71..355e7f0 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test26.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test26.scxml @@ -3,33 +3,32 @@ here we have multiple interrupt conflicts, originating from d and a2. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> + <parallel id="b"> - <state id="c"> - <transition event="t" target="a1"/> - </state> + <state id="c"> + <transition event="t" target="a1"/> + </state> - <state id="d" initial="d1"> - <state id="d1"> - <transition event="t" target="d2"/> - </state> + <state id="d" initial="d1"> + <state id="d1"> + <transition event="t" target="d2"/> + </state> - <state id="d2"/> - </state> + <state id="d2"/> + </state> - <transition event="t" target="a2"/> + <transition event="t" target="a2"/> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test27.json b/test/scxml-test-framework/test/parallel+interrupt/test27.json index 1bfe6bf..46de906 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test27.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test27.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c1","d1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c2","d2"] - } - - ] + "initialConfiguration" : ["c1","d1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c2","d2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test27.scxml b/test/scxml-test-framework/test/parallel+interrupt/test27.scxml index 6bf78b8..e5b7384 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test27.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test27.scxml @@ -18,34 +18,33 @@ here we have multiple interrupt conflicts, originating from d and a2. transitions from c1 and d1 will win, for same reasons listed above --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="c2"/> - </state> + <parallel id="b"> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="c2"/> + </state> - <state id="c2"/> - </state> + <state id="c2"/> + </state> - <state id="d" initial="d1"> - <state id="d1"> - <transition event="t" target="d2"/> - </state> + <state id="d" initial="d1"> + <state id="d1"> + <transition event="t" target="d2"/> + </state> - <state id="d2"/> - </state> + <state id="d2"/> + </state> - <transition event="t" target="a1" /> + <transition event="t" target="a1" /> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test28.json b/test/scxml-test-framework/test/parallel+interrupt/test28.json index 54a4859..ebb83a8 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test28.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test28.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2"] - } - - ] + "initialConfiguration" : ["c","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test28.scxml b/test/scxml-test-framework/test/parallel+interrupt/test28.scxml index a0ce570..724a023 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test28.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test28.scxml @@ -18,28 +18,27 @@ inner transition will have priority, so final state will be a2. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c"/> + <parallel id="b"> + <state id="c"/> - <state id="d"> - <transition event="t" target="a2"/> - </state> + <state id="d"> + <transition event="t" target="a2"/> + </state> - <transition event="t" target="a"/> - </parallel> + <transition event="t" target="a"/> + </parallel> - <state id="a" initial="a1"> - <state id="a1"/> + <state id="a" initial="a1"> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test29.json b/test/scxml-test-framework/test/parallel+interrupt/test29.json index cf79edb..744f5da 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test29.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test29.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1"] - } - - ] + "initialConfiguration" : ["c","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test29.scxml b/test/scxml-test-framework/test/parallel+interrupt/test29.scxml index 3e111d8..d6bc1f0 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test29.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test29.scxml @@ -18,28 +18,27 @@ inner transition will have priority, so final state will be a1. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c"/> + <parallel id="b"> + <state id="c"/> - <state id="d"> - <transition event="t" target="a"/> - </state> + <state id="d"> + <transition event="t" target="a"/> + </state> - <transition event="t" target="a2"/> - </parallel> + <transition event="t" target="a2"/> + </parallel> - <state id="a" initial="a1"> - <state id="a1"/> + <state id="a" initial="a1"> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test3.json b/test/scxml-test-framework/test/parallel+interrupt/test3.json index e2fcd8b..804186e 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test3.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test3.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["e","f","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1"] - } - - ] + "initialConfiguration" : ["e","f","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test3.scxml b/test/scxml-test-framework/test/parallel+interrupt/test3.scxml index 84c8c78..a21a4e2 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test3.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test3.scxml @@ -4,37 +4,36 @@ orthogonal preemption - inner or states interrupt one-another in our semantics, source state is at the same level of hierarchy, so document order will resolve conflict. a1 will win. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <parallel id="c"> - <state id="e"> - <transition event="t" target="a1"/> - </state> + <parallel id="b"> + <parallel id="c"> + <state id="e"> + <transition event="t" target="a1"/> + </state> - <state id="f"> - <transition event="t" target="a2"/> - </state> + <state id="f"> + <transition event="t" target="a2"/> + </state> - <transition event="t" target="a3"/> - </parallel> + <transition event="t" target="a3"/> + </parallel> - <state id="d"> - <transition event="t" target="a4"/> - </state> + <state id="d"> + <transition event="t" target="a4"/> + </state> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> - <state id="a3"/> + <state id="a3"/> - <state id="a4"/> + <state id="a4"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test30.json b/test/scxml-test-framework/test/parallel+interrupt/test30.json index 4f2cf18..3730a94 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test30.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test30.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c1","d"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c2","d"] - } - - ] + "initialConfiguration" : ["c1","d"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c2","d"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test30.scxml b/test/scxml-test-framework/test/parallel+interrupt/test30.scxml index 6163338..b10720b 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test30.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test30.scxml @@ -19,34 +19,33 @@ here we have multiple interrupt conflicts, originating from d and a2. transition from c1 will win, for same reasons listed above. final state will be: c2 --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="c2"/> - </state> + <parallel id="b"> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="c2"/> + </state> - <state id="c2"/> - </state> + <state id="c2"/> + </state> - <state id="d"> - <transition event="t" target="a"/> - </state> + <state id="d"> + <transition event="t" target="a"/> + </state> - <transition event="t" target="a2"/> + <transition event="t" target="a2"/> - </parallel> + </parallel> - <state id="a" initial="a1"> - <state id="a1"/> + <state id="a" initial="a1"> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test31.json b/test/scxml-test-framework/test/parallel+interrupt/test31.json index 355a5b3..a66b39a 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test31.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test31.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c1","d1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1"] - } - - ] + "initialConfiguration" : ["c1","d1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test31.scxml b/test/scxml-test-framework/test/parallel+interrupt/test31.scxml index c20d2d9..a90fe8f 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test31.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test31.scxml @@ -19,37 +19,36 @@ here we have multiple interrupt conflicts, originating from d and a2. transition from c1 will win, for same reasons listed above. final state will be: a1 --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> + <parallel id="b"> - <state id="c" initial="c1"> - <state id="c1"> - <transition event="t" target="a"/> - </state> - </state> + <state id="c" initial="c1"> + <state id="c1"> + <transition event="t" target="a"/> + </state> + </state> - <state id="d" initial="d1"> - <state id="d1"> - <transition event="t" target="d2"/> - </state> + <state id="d" initial="d1"> + <state id="d1"> + <transition event="t" target="d2"/> + </state> - <state id="d2"/> - </state> + <state id="d2"/> + </state> - <transition event="t" target="a2"/> + <transition event="t" target="a2"/> - </parallel> + </parallel> - <state id="a" initial="a1"> - <state id="a1"/> + <state id="a" initial="a1"> + <state id="a1"/> - <state id="a2"/> - </state> + <state id="a2"/> + </state> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test4.json b/test/scxml-test-framework/test/parallel+interrupt/test4.json index bbdc56d..497debc 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test4.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test4.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["e","f","g"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a1"] - } - - ] + "initialConfiguration" : ["e","f","g"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a1"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test4.scxml b/test/scxml-test-framework/test/parallel+interrupt/test4.scxml index d705279..ca9d2bd 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test4.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test4.scxml @@ -18,43 +18,42 @@ orthogonal preemption - inner or states interrupt one-another --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <parallel id="p"> - <state id="e"> - <transition event="t" target="a1"/> - </state> + <parallel id="b"> + <parallel id="p"> + <state id="e"> + <transition event="t" target="a1"/> + </state> - <state id="f"> - <transition event="t" target="a2"/> - </state> + <state id="f"> + <transition event="t" target="a2"/> + </state> - <transition event="t" target="a3"/> - </parallel> + <transition event="t" target="a3"/> + </parallel> - <state id="d" initial="g"> - <state id="g"> - <transition event="t" target="h"/> - </state> + <state id="d" initial="g"> + <state id="g"> + <transition event="t" target="h"/> + </state> - <state id="h"/> - </state> + <state id="h"/> + </state> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> - <state id="a3"/> + <state id="a3"/> - <state id="a4"/> + <state id="a4"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test5.json b/test/scxml-test-framework/test/parallel+interrupt/test5.json index fd1c05f..117dc4d 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test5.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test5.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["e","f","g"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["e","f","h"] - } - - ] + "initialConfiguration" : ["e","f","g"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["e","f","h"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test5.scxml b/test/scxml-test-framework/test/parallel+interrupt/test5.scxml index f96d49e..2d853a4 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test5.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test5.scxml @@ -18,41 +18,40 @@ orthogonal preemption - inner or states interrupt one-another --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="d" initial="g"> - <state id="g"> - <transition event="t" target="h"/> - </state> + <parallel id="b"> + <state id="d" initial="g"> + <state id="g"> + <transition event="t" target="h"/> + </state> - <state id="h"/> - </state> + <state id="h"/> + </state> - <parallel id="p"> - <state id="e"> - <transition event="t" target="a1"/> - </state> + <parallel id="p"> + <state id="e"> + <transition event="t" target="a1"/> + </state> - <state id="f"> - <transition event="t" target="a2"/> - </state> + <state id="f"> + <transition event="t" target="a2"/> + </state> - <transition event="t" target="a3"/> - </parallel> - </parallel> + <transition event="t" target="a3"/> + </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> - <state id="a2"/> + <state id="a2"/> - <state id="a3"/> + <state id="a3"/> - <state id="a4"/> + <state id="a4"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test6.json b/test/scxml-test-framework/test/parallel+interrupt/test6.json index 8cec47b..2876d0b 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test6.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test6.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["g","e1","f1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["h","e2","f2"] - } + "initialConfiguration" : ["g","e1","f1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["h","e2","f2"] + } - ] + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test6.scxml b/test/scxml-test-framework/test/parallel+interrupt/test6.scxml index e2640ba..5b5702a 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test6.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test6.scxml @@ -16,47 +16,46 @@ --> <!-- orthogonal preemption - inner or states interrupt one-another - no conflicts here - initial configuration: [g,e1,f1] - given event t: [h,e2,f2] + no conflicts here + initial configuration: [g,e1,f1] + given event t: [h,e2,f2] TODO: move this to basic parallel group --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c" initial="g"> - <state id="g"> - <transition event="t" target="h"/> - </state> + <parallel id="b"> + <state id="c" initial="g"> + <state id="g"> + <transition event="t" target="h"/> + </state> - <state id="h"/> - </state> + <state id="h"/> + </state> - <parallel id="d"> - <state id="e" initial="e1"> - <state id="e1"> - <transition event="t" target="e2"/> - </state> + <parallel id="d"> + <state id="e" initial="e1"> + <state id="e1"> + <transition event="t" target="e2"/> + </state> - <state id="e2"/> - </state> + <state id="e2"/> + </state> - <state id="f" initial="f1"> - <state id="f1"> - <transition event="t" target="f2"/> - </state> + <state id="f" initial="f1"> + <state id="f1"> + <transition event="t" target="f2"/> + </state> - <state id="f2"/> - </state> + <state id="f2"/> + </state> - </parallel> + </parallel> - </parallel> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test7.json b/test/scxml-test-framework/test/parallel+interrupt/test7.json index 2c94f66..ec5e2b4 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test7.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test7.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["c","e1","f1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c","e2","f2"] - } - - ] + "initialConfiguration" : ["c","e1","f1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c","e2","f2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test7.scxml b/test/scxml-test-framework/test/parallel+interrupt/test7.scxml index b16c052..97a3513 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test7.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test7.scxml @@ -22,39 +22,38 @@ initial configuration: [c,e1,f1] given event t: [c,e2,f2] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="b"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="b"> - <parallel id="b"> - <state id="c"> - <transition event="t" target="a1"/> - </state> + <parallel id="b"> + <state id="c"> + <transition event="t" target="a1"/> + </state> - <parallel id="d"> - <state id="e" initial="e1"> - <state id="e1"> - <transition event="t" target="e2"/> - </state> + <parallel id="d"> + <state id="e" initial="e1"> + <state id="e1"> + <transition event="t" target="e2"/> + </state> - <state id="e2"/> - </state> + <state id="e2"/> + </state> - <state id="f" initial="f1"> - <state id="f1"> - <transition event="t" target="f2"/> - </state> + <state id="f" initial="f1"> + <state id="f1"> + <transition event="t" target="f2"/> + </state> - <state id="f2"/> - </state> + <state id="f2"/> + </state> - </parallel> + </parallel> - </parallel> + </parallel> - <state id="a1"/> + <state id="a1"/> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test8.json b/test/scxml-test-framework/test/parallel+interrupt/test8.json index 95ce85e..dea59df 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test8.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test8.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["b1","b2"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c1","c2"] - } - - ] + "initialConfiguration" : ["b1","b2"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c1","c2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test8.scxml b/test/scxml-test-framework/test/parallel+interrupt/test8.scxml index a81b230..9068ff3 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test8.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test8.scxml @@ -20,31 +20,30 @@ initial: [b1,b2] after t: [c1,c2] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> - - <state id="a" initial="b"> - <parallel id="b"> - <state id="b1"> - </state> - - <state id="b2"> - </state> - - <transition event="t" target="c"/> - </parallel> - - <parallel id="c"> - <state id="c1"> - </state> - - <state id="c2"> - </state> - </parallel> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> + + <state id="a" initial="b"> + <parallel id="b"> + <state id="b1"> + </state> + + <state id="b2"> + </state> + + <transition event="t" target="c"/> + </parallel> + + <parallel id="c"> + <state id="c1"> + </state> + + <state id="c2"> + </state> + </parallel> + </state> </scxml> diff --git a/test/scxml-test-framework/test/parallel+interrupt/test9.json b/test/scxml-test-framework/test/parallel+interrupt/test9.json index b7eb5cd..621ba48 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test9.json +++ b/test/scxml-test-framework/test/parallel+interrupt/test9.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["b1","b2"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c1","c2"] - } - - ] + "initialConfiguration" : ["b1","b2"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c1","c2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel+interrupt/test9.scxml b/test/scxml-test-framework/test/parallel+interrupt/test9.scxml index 0169ed4..65231e8 100644 --- a/test/scxml-test-framework/test/parallel+interrupt/test9.scxml +++ b/test/scxml-test-framework/test/parallel+interrupt/test9.scxml @@ -20,30 +20,29 @@ initial: [b1,b2] after t: [c1,c2] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="a"> - - <state id="a" initial="b"> - <parallel id="b"> - <state id="b1"> - <transition event="t" target="c"/> - </state> - - <state id="b2"> - </state> - </parallel> - - <parallel id="c"> - <state id="c1"> - </state> - - <state id="c2"> - </state> - </parallel> - </state> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="a"> + + <state id="a" initial="b"> + <parallel id="b"> + <state id="b1"> + <transition event="t" target="c"/> + </state> + + <state id="b2"> + </state> + </parallel> + + <parallel id="c"> + <state id="c1"> + </state> + + <state id="c2"> + </state> + </parallel> + </state> </scxml> diff --git a/test/scxml-test-framework/test/parallel/test0.json b/test/scxml-test-framework/test/parallel/test0.json index 5eccd85..0150078 100644 --- a/test/scxml-test-framework/test/parallel/test0.json +++ b/test/scxml-test-framework/test/parallel/test0.json @@ -1,6 +1,6 @@ { - "initialConfiguration" : ["a","b"], - "events" : [ ] + "initialConfiguration" : ["a","b"], + "events" : [ ] } diff --git a/test/scxml-test-framework/test/parallel/test0.scxml b/test/scxml-test-framework/test/parallel/test0.scxml index 968b281..6ae0838 100644 --- a/test/scxml-test-framework/test/parallel/test0.scxml +++ b/test/scxml-test-framework/test/parallel/test0.scxml @@ -15,20 +15,15 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial id="intitial1"> - <transition target="p"/> - </initial> + <parallel id="p"> + <state id="a"/> - <parallel id="p"> - <state id="a"/> - - <state id="b"/> - </parallel> + <state id="b"/> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/parallel/test1.json b/test/scxml-test-framework/test/parallel/test1.json index 16791aa..6827a36 100644 --- a/test/scxml-test-framework/test/parallel/test1.json +++ b/test/scxml-test-framework/test/parallel/test1.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["a1","b1"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["a2","b2"] - } - - ] + "initialConfiguration" : ["a1","b1"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["a2","b2"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel/test1.scxml b/test/scxml-test-framework/test/parallel/test1.scxml deleted file mode 100644 index 8fb9fda..0000000 --- a/test/scxml-test-framework/test/parallel/test1.scxml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2011-2012 Jacob Beard, INFICON, and other SCION contributors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial> - <transition target="p"/> - </initial> - - <parallel id="p"> - <state id="a"> - <initial> - <transition target="a1"/> - </initial> - - <state id="a1"> - <transition event="t" target="a2"/> - </state> - - <state id="a2"/> - </state> - - <state id="b"> - <initial> - <transition target="b1"/> - </initial> - - <state id="b1"> - <transition event="t" target="b2"/> - </state> - - <state id="b2"/> - </state> - </parallel> - - -</scxml> - - diff --git a/test/scxml-test-framework/test/assign-next-small-step/test0.scxml b/test/scxml-test-framework/test/parallel/test1.scxml.fail index b7ffdfe..1c0fc61 100644 --- a/test/scxml-test-framework/test/assign-next-small-step/test0.scxml +++ b/test/scxml-test-framework/test/parallel/test1.scxml.fail @@ -15,35 +15,37 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <datamodel> - <data id="a"/> - </datamodel> + <parallel id="p"> + <state id="a"> + <initial id="ia"> + <transition target="a1"/> + </initial> - <initial id="intitial1"> - <transition target="a"> - <script> - setData('a',100); - </script> - </transition> - </initial> + <state id="a1"> + <transition event="t" target="a2"/> + </state> - <state id="a"> - <transition target="b" event="t" cond="getData('a') === 100"/> - <transition target="f" event="t" /> - </state> + <state id="a2"/> + </state> - <state id="b"/> + <state id="b"> + <initial id="ib"> + <transition target="b1"/> + </initial> - <state id="f"/> + <state id="b1"> + <transition event="t" target="b2"/> + </state> - -</scxml> + <state id="b2"/> + </state> + </parallel> +</scxml> diff --git a/test/scxml-test-framework/test/parallel/test2.json b/test/scxml-test-framework/test/parallel/test2.json index 367322c..7e7f790 100644 --- a/test/scxml-test-framework/test/parallel/test2.json +++ b/test/scxml-test-framework/test/parallel/test2.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["s3","s4","s7","s8"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["s5","s6","s9","s10"] - } - - ] + "initialConfiguration" : ["s3","s4","s7","s8"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["s5","s6","s9","s10"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel/test2.scxml b/test/scxml-test-framework/test/parallel/test2.scxml index 2802842..c73d0dd 100644 --- a/test/scxml-test-framework/test/parallel/test2.scxml +++ b/test/scxml-test-framework/test/parallel/test2.scxml @@ -19,50 +19,45 @@ initial configuration: [s3,s4,s7,s8] after event t: [s5,s6,s9,s10] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <initial> - <transition target="p1"/> - </initial> + <parallel id="p1"> + <state id="s1" initial="p2"> + <parallel id="p2"> + <state id="s3"/> - <parallel id="p1"> - <state id="s1" initial="p2"> - <parallel id="p2"> - <state id="s3"/> + <state id="s4"/> - <state id="s4"/> + <transition target="p3" event="t"/> + </parallel> - <transition target="p3" event="t"/> - </parallel> + <parallel id="p3"> + <state id="s5"/> - <parallel id="p3"> - <state id="s5"/> + <state id="s6"/> + </parallel> - <state id="s6"/> - </parallel> + </state> - </state> + <state id="s2" initial="p4"> + <parallel id="p4"> + <state id="s7"/> - <state id="s2" initial="p4"> - <parallel id="p4"> - <state id="s7"/> + <state id="s8"/> - <state id="s8"/> + <transition target="p5" event="t"/> + </parallel> - <transition target="p5" event="t"/> - </parallel> + <parallel id="p5"> + <state id="s9"/> - <parallel id="p5"> - <state id="s9"/> + <state id="s10"/> + </parallel> + </state> - <state id="s10"/> - </parallel> - </state> - - </parallel> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/parallel/test3.json b/test/scxml-test-framework/test/parallel/test3.json index 99379fe..88737e1 100644 --- a/test/scxml-test-framework/test/parallel/test3.json +++ b/test/scxml-test-framework/test/parallel/test3.json @@ -1,12 +1,12 @@ { - "initialConfiguration" : ["s3.1","s4","s7","s8"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["s3.2","s4","s9","s10"] - } - - ] + "initialConfiguration" : ["s3.1","s4","s7","s8"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["s3.2","s4","s9","s10"] + } + + ] } diff --git a/test/scxml-test-framework/test/parallel/test3.scxml b/test/scxml-test-framework/test/parallel/test3.scxml index a0ab2ff..e143417 100644 --- a/test/scxml-test-framework/test/parallel/test3.scxml +++ b/test/scxml-test-framework/test/parallel/test3.scxml @@ -19,59 +19,58 @@ initial configuration: [s3.1,s4,s7,s8] after event t: [s3.2,s4,s9,s10] --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root" - initial="p1"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0" + initial="p1"> - <parallel id="p1"> - <state id="s1" initial="p2"> - <parallel id="p2"> - <state id="s3" initial="s3.1"> - <state id="s3.1"> - <transition target="s3.2" event="t"/> - </state> + <parallel id="p1"> + <state id="s1" initial="p2"> + <parallel id="p2"> + <state id="s3" initial="s3.1"> + <state id="s3.1"> + <transition target="s3.2" event="t"/> + </state> - <state id="s3.2"/> - </state> + <state id="s3.2"/> + </state> - <state id="s4"> - </state> + <state id="s4"> + </state> - </parallel> + </parallel> - <parallel id="p3"> - <state id="s5"> - </state> + <parallel id="p3"> + <state id="s5"> + </state> - <state id="s6"> - </state> - </parallel> + <state id="s6"> + </state> + </parallel> - </state> + </state> - <state id="s2" initial="p4"> - <parallel id="p4"> - <state id="s7"> - </state> + <state id="s2" initial="p4"> + <parallel id="p4"> + <state id="s7"> + </state> - <state id="s8"> - </state> + <state id="s8"> + </state> - <transition target="p5" event="t"/> - </parallel> + <transition target="p5" event="t"/> + </parallel> - <parallel id="p5"> - <state id="s9"> - </state> + <parallel id="p5"> + <state id="s9"> + </state> - <state id="s10"> - </state> - </parallel> - </state> + <state id="s10"> + </state> + </parallel> + </state> - </parallel> + </parallel> </scxml> diff --git a/test/scxml-test-framework/test/script-src/script-0-0.js b/test/scxml-test-framework/test/script-src/script-0-0.js index 6a2b22f..062f555 100644 --- a/test/scxml-test-framework/test/script-src/script-0-0.js +++ b/test/scxml-test-framework/test/script-src/script-0-0.js @@ -1 +1 @@ -setData('a',100); +x = 100; diff --git a/test/scxml-test-framework/test/script-src/script-1-0.js b/test/scxml-test-framework/test/script-src/script-1-0.js index e93bc2c..226697f 100644 --- a/test/scxml-test-framework/test/script-src/script-1-0.js +++ b/test/scxml-test-framework/test/script-src/script-1-0.js @@ -1 +1 @@ -setData('i',0) +i = 0; diff --git a/test/scxml-test-framework/test/script-src/script-1-1.js b/test/scxml-test-framework/test/script-src/script-1-1.js index 5c7d88d..8dca7b1 100644 --- a/test/scxml-test-framework/test/script-src/script-1-1.js +++ b/test/scxml-test-framework/test/script-src/script-1-1.js @@ -1 +1 @@ -setData('i',getData('i') + 1) +i = i + 1; diff --git a/test/scxml-test-framework/test/script-src/script-2-0.js b/test/scxml-test-framework/test/script-src/script-2-0.js index e93bc2c..226697f 100644 --- a/test/scxml-test-framework/test/script-src/script-2-0.js +++ b/test/scxml-test-framework/test/script-src/script-2-0.js @@ -1 +1 @@ -setData('i',0) +i = 0; diff --git a/test/scxml-test-framework/test/script-src/script-2-1.js b/test/scxml-test-framework/test/script-src/script-2-1.js index 5c7d88d..8dca7b1 100644 --- a/test/scxml-test-framework/test/script-src/script-2-1.js +++ b/test/scxml-test-framework/test/script-src/script-2-1.js @@ -1 +1 @@ -setData('i',getData('i') + 1) +i = i + 1; diff --git a/test/scxml-test-framework/test/script-src/script-2-2.js b/test/scxml-test-framework/test/script-src/script-2-2.js index 5c7d88d..8dca7b1 100644 --- a/test/scxml-test-framework/test/script-src/script-2-2.js +++ b/test/scxml-test-framework/test/script-src/script-2-2.js @@ -1 +1 @@ -setData('i',getData('i') + 1) +i = i + 1; diff --git a/test/scxml-test-framework/test/script-src/script-2-3.js b/test/scxml-test-framework/test/script-src/script-2-3.js index d60b3c8..795c1f2 100644 --- a/test/scxml-test-framework/test/script-src/script-2-3.js +++ b/test/scxml-test-framework/test/script-src/script-2-3.js @@ -1 +1 @@ -setData('i',getData('i') * 2) +i = i * 2; diff --git a/test/scxml-test-framework/test/script-src/script-3-0.js b/test/scxml-test-framework/test/script-src/script-3-0.js index ccc8f7b..de469c4 100644 --- a/test/scxml-test-framework/test/script-src/script-3-0.js +++ b/test/scxml-test-framework/test/script-src/script-3-0.js @@ -1,3 +1,3 @@ function foo(){ - a = 100; + x = 100; } diff --git a/test/scxml-test-framework/test/script-src/test0.json b/test/scxml-test-framework/test/script-src/test0.json index 1d2faec..c27c2fd 100644 --- a/test/scxml-test-framework/test/script-src/test0.json +++ b/test/scxml-test-framework/test/script-src/test0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/script-src/test0.scxml b/test/scxml-test-framework/test/script-src/test0.scxml index c2c12cd..358405c 100644 --- a/test/scxml-test-framework/test/script-src/test0.scxml +++ b/test/scxml-test-framework/test/script-src/test0.scxml @@ -15,29 +15,28 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> <datamodel> - <data id="a"/> + <data id="x"/> </datamodel> - <initial id="intitial1"> - <transition target="a"> - <script src="script-0-0.js"/> - </transition> - </initial> + <state id="initial"> + <transition target="a"> + <script src="script-0-0.js"/> + </transition> + </state> - <state id="a"> - <transition target="b" event="t" cond="getData('a') === 100"/> - <transition target="f" event="t" /> - </state> + <state id="a"> + <transition target="b" event="t" cond="x === 100"/> + <transition target="f" event="t" /> + </state> - <state id="b"/> + <state id="b"/> - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/script-src/test1.json b/test/scxml-test-framework/test/script-src/test1.json index 8424ef5..0e49c49 100644 --- a/test/scxml-test-framework/test/script-src/test1.json +++ b/test/scxml-test-framework/test/script-src/test1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/script-src/test1.scxml b/test/scxml-test-framework/test/script-src/test1.scxml index 5ccf8a6..acb601c 100644 --- a/test/scxml-test-framework/test/script-src/test1.scxml +++ b/test/scxml-test-framework/test/script-src/test1.scxml @@ -15,33 +15,28 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <datamodel> - <data id="i"/> - </datamodel> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - <assign location="i" expr="0"/> - <script src="script-1-0.js"/> - </transition> - </state> - - <state id="b"> - <transition target="b" cond="getData('i') < 100"> - <script src="script-1-1.js"/> - </transition> - <transition target="c" cond="getData('i') === 100"/> - </state> - - <state id="c"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="i"/> + </datamodel> + + <state id="a"> + <transition target="b" event="t"> + <assign location="i" expr="0"/> + <script src="script-1-0.js"/> + </transition> + </state> + + <state id="b"> + <transition target="b" cond="i < 100"> + <script src="script-1-1.js"/> + </transition> + <transition target="c" cond="i === 100"/> + </state> + + <state id="c"/> </scxml> diff --git a/test/scxml-test-framework/test/script-src/test2.json b/test/scxml-test-framework/test/script-src/test2.json index 6769dfe..36628bc 100644 --- a/test/scxml-test-framework/test/script-src/test2.json +++ b/test/scxml-test-framework/test/script-src/test2.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["e"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["e"] + } + ] } diff --git a/test/scxml-test-framework/test/script-src/test2.scxml b/test/scxml-test-framework/test/script-src/test2.scxml index 6b9192d..aa920ee 100644 --- a/test/scxml-test-framework/test/script-src/test2.scxml +++ b/test/scxml-test-framework/test/script-src/test2.scxml @@ -15,53 +15,48 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> <datamodel> <data id="i"/> </datamodel> - <initial id="intitial1"> - <transition target="a"/> - </initial> + <state id="a"> + <transition target="b" event="t"> + <script src="script-2-0.js"/> + </transition> + </state> - <state id="a"> - <transition target="b" event="t"> - <script src="script-2-0.js"/> - </transition> - </state> + <state id="A"> - <state id="A"> + <state id="b"> + <transition target="c" cond="i < 100"> + <script src="script-2-1.js"/> + </transition> + </state> - <state id="b"> - <transition target="c" cond="getData('i') < 100"> - <script src="script-2-1.js"/> - </transition> - </state> + <state id="c"> + <transition target="b" cond="i < 100"> + <script src="script-2-2.js"/> + </transition> + </state> - <state id="c"> - <transition target="b" cond="getData('i') < 100"> - <script src="script-2-2.js"/> - </transition> - </state> + <transition target="d" cond="i === 100"> + <script src="script-2-3.js"/> + </transition> + </state> - <transition target="d" cond="getData('i') === 100"> - <script src="script-2-3.js"/> - </transition> - </state> + <state id="d"> + <transition target="e" cond="i === 200"/> + <transition target="f"/> + </state> - <state id="d"> - <transition target="e" cond="getData('i') === 200"/> - <transition target="f"/> - </state> + <state id="e"/> - <state id="e"/> - - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/script-src/test3.json b/test/scxml-test-framework/test/script-src/test3.json index 1d2faec..c27c2fd 100644 --- a/test/scxml-test-framework/test/script-src/test3.json +++ b/test/scxml-test-framework/test/script-src/test3.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/script-src/test3.scxml b/test/scxml-test-framework/test/script-src/test3.scxml index c3cdb08..d712686 100644 --- a/test/scxml-test-framework/test/script-src/test3.scxml +++ b/test/scxml-test-framework/test/script-src/test3.scxml @@ -15,33 +15,32 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> <script src="script-3-0.js"/> <datamodel> - <data id="a"/> + <data id="x"/> </datamodel> - <initial id="intitial1"> - <transition target="a"> - <script> - foo(); - </script> - </transition> - </initial> + <state id="intitial1"> + <transition target="a"> + <script> + foo(); + </script> + </transition> + </state> - <state id="a"> - <transition target="b" event="t" cond="getData('a') === 100"/> - <transition target="f" event="t" /> - </state> + <state id="a"> + <transition target="b" event="t" cond="x === 100"/> + <transition target="f" event="t" /> + </state> - <state id="b"/> + <state id="b"/> - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/script/test0.json b/test/scxml-test-framework/test/script/test0.json index 1d2faec..c27c2fd 100644 --- a/test/scxml-test-framework/test/script/test0.json +++ b/test/scxml-test-framework/test/script/test0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/script/test0.scxml b/test/scxml-test-framework/test/script/test0.scxml index 43d9e0b..21d911d 100644 --- a/test/scxml-test-framework/test/script/test0.scxml +++ b/test/scxml-test-framework/test/script/test0.scxml @@ -15,31 +15,30 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"> - <script> - setData('a',100) - </script> - </transition> - </initial> - - <datamodel> - <data id="a"/> - </datamodel> - - <state id="a"> - <transition target="b" event="t" cond="getData('a') === 100"/> - <transition target="f" event="t" /> - </state> - - <state id="b"/> - - <state id="f"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="x"/> + </datamodel> + + <state id="intitial1"> + <transition target="a"> + <script> + x = 100; + </script> + </transition> + </state> + + <state id="a"> + <transition target="b" event="t" cond="x === 100"/> + <transition target="f" event="t" /> + </state> + + <state id="b"/> + + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/script/test1.json b/test/scxml-test-framework/test/script/test1.json index 8424ef5..0e49c49 100644 --- a/test/scxml-test-framework/test/script/test1.json +++ b/test/scxml-test-framework/test/script/test1.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["c"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["c"] + } + ] } diff --git a/test/scxml-test-framework/test/script/test1.scxml b/test/scxml-test-framework/test/script/test1.scxml index 4646c2e..cd6b2e6 100644 --- a/test/scxml-test-framework/test/script/test1.scxml +++ b/test/scxml-test-framework/test/script/test1.scxml @@ -15,37 +15,31 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <datamodel> - <data id="i"/> - </datamodel> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <state id="a"> - <transition target="b" event="t"> - <assign location="i" expr="0"/> - <script> - setData('i',0) - </script> - </transition> - </state> - - <state id="b"> - <transition target="b" cond="getData('i') < 100"> - <script> - setData('i',getData('i') + 1) - </script> - </transition> - <transition target="c" cond="getData('i') === 100"/> - </state> - - <state id="c"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="x"/> + </datamodel> + + <state id="a"> + <transition target="b" event="t"> + <script> + x = 0; + </script> + </transition> + </state> + + <state id="b"> + <transition target="b" cond="x < 100"> + <script> + x = x + 1; + </script> + </transition> + <transition target="c" cond="x === 100"/> + </state> + + <state id="c"/> </scxml> diff --git a/test/scxml-test-framework/test/script/test2.json b/test/scxml-test-framework/test/script/test2.json index 6769dfe..36628bc 100644 --- a/test/scxml-test-framework/test/script/test2.json +++ b/test/scxml-test-framework/test/script/test2.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["e"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["e"] + } + ] } diff --git a/test/scxml-test-framework/test/script/test2.scxml b/test/scxml-test-framework/test/script/test2.scxml index 9623cd6..f3b469e 100644 --- a/test/scxml-test-framework/test/script/test2.scxml +++ b/test/scxml-test-framework/test/script/test2.scxml @@ -15,61 +15,56 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" - id="root"> - - <initial id="intitial1"> - <transition target="a"/> - </initial> - - <datamodel> - <data id="i"/> - </datamodel> - - <state id="a"> - <transition target="b" event="t"> - <script> - setData('i',0) - </script> - </transition> - </state> - - <state id="A"> - - <state id="b"> - <transition target="c" cond="getData('i') < 100"> - <script> - setData('i',getData('i') + 1) - </script> - </transition> - </state> - - <state id="c"> - <transition target="b" cond="getData('i') < 100"> - <script> - setData('i',getData('i') + 1) - </script> - </transition> - </state> - - <transition target="d" cond="getData('i') === 100"> - <script> - setData('i',getData('i') * 2) - </script> - </transition> - </state> - - - <state id="d"> - <transition target="e" cond="getData('i') === 200"/> - <transition target="f"/> - </state> - - <state id="e"/> - - <state id="f"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="x"/> + </datamodel> + + <state id="a"> + <transition target="b" event="t"> + <script> + x = 0; + </script> + </transition> + </state> + + <state id="A"> + + <state id="b"> + <transition target="c" cond="x < 100"> + <script> + x = x + 1; + </script> + </transition> + </state> + + <state id="c"> + <transition target="b" cond="x < 100"> + <script> + x = x + 1; + </script> + </transition> + </state> + + <transition target="d" cond="x === 100"> + <script> + x = x * 2; + </script> + </transition> + </state> + + + <state id="d"> + <transition target="e" cond="x === 200"/> + <transition target="f"/> + </state> + + <state id="e"/> + + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/star0.json b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/star0.json index d5bb5f5..577a005 100644 --- a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/star0.json +++ b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/star0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "foo" }, - "nextConfiguration" : ["b"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "foo" }, + "nextConfiguration" : ["b"] + } + ] } diff --git a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/star0.scxml b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/star0.scxml index 54a86d5..31345a8 100644 --- a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/star0.scxml +++ b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/star0.scxml @@ -15,20 +15,20 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" > + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <state id="a"> - <!-- we send foo here, and it matches the * event --> - <transition target="b" event="*"/> - <transition target="fail" event="foo"/> - </state> - - <state id="b"> - </state> + <state id="a"> + <!-- we send foo here, and it matches the * event --> + <transition target="b" event="*"/> + <transition target="fail" event="foo"/> + </state> + + <state id="b"> + </state> - <state id="fail"/> + <state id="fail"/> </scxml> diff --git a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test0.json b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test0.json index ec26a85..bf11b72 100644 --- a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test0.json +++ b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test0.json @@ -1,39 +1,39 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "foo" }, - "nextConfiguration" : ["b"] - }, - { - "event" : { "name" : "foo.bar" }, - "nextConfiguration" : ["c"] - }, - { - "event" : { "name" : "foo.bar.bat" }, - "nextConfiguration" : ["d"] - }, - { - "event" : { "name" : "foo.bar.bat" }, - "nextConfiguration" : ["e"] - }, - { - "event" : { "name" : "foo" }, - "nextConfiguration" : ["e"] - }, - { - "event" : { "name" : "foo.bar.bat" }, - "nextConfiguration" : ["f"] - }, - { - "event" : { "name" : "foobar" }, - "nextConfiguration" : ["f"] - }, - { - "event" : { "name" : "foo.bar.bat.bif" }, - "nextConfiguration" : ["g"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "foo" }, + "nextConfiguration" : ["b"] + }, + { + "event" : { "name" : "foo.bar" }, + "nextConfiguration" : ["c"] + }, + { + "event" : { "name" : "foo.bar.bat" }, + "nextConfiguration" : ["d"] + }, + { + "event" : { "name" : "foo.bar.bat" }, + "nextConfiguration" : ["e"] + }, + { + "event" : { "name" : "foo" }, + "nextConfiguration" : ["e"] + }, + { + "event" : { "name" : "foo.bar.bat" }, + "nextConfiguration" : ["f"] + }, + { + "event" : { "name" : "foobar" }, + "nextConfiguration" : ["f"] + }, + { + "event" : { "name" : "foo.bar.bat.bif" }, + "nextConfiguration" : ["g"] + } + ] } diff --git a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test0.scxml b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test0.scxml index 85c9a54..3d14125 100644 --- a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test0.scxml +++ b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test0.scxml @@ -15,34 +15,34 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" > + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <state id="a"> - <transition target="b" event="foo"/> - </state> + <state id="a"> + <transition target="b" event="foo"/> + </state> - <state id="b"> - <transition target="c" event="foo.bar"/> - </state> + <state id="b"> + <transition target="c" event="foo.bar"/> + </state> - <state id="c"> - <transition target="d" event="foo.bar.bat"/> - </state> + <state id="c"> + <transition target="d" event="foo.bar.bat"/> + </state> - <state id="d"> - <transition target="e" event="foo"/> - </state> + <state id="d"> + <transition target="e" event="foo"/> + </state> - <state id="e"> - <transition target="f" event="foo.bar"/> - </state> + <state id="e"> + <transition target="f" event="foo.bar"/> + </state> - <state id="f"> - <transition target="g" event="foo.bar.bat"/> - </state> + <state id="f"> + <transition target="g" event="foo.bar.bat"/> + </state> - <state id="g"/> + <state id="g"/> </scxml> diff --git a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test1.json b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test1.json index db698ba..c3c994c 100644 --- a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test1.json +++ b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test1.json @@ -1,39 +1,39 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "foo" }, - "nextConfiguration" : ["b"] - }, - { - "event" : { "name" : "foo.bar" }, - "nextConfiguration" : ["c"] - }, - { - "event" : { "name" : "foo.bar.bat" }, - "nextConfiguration" : ["d"] - }, - { - "event" : { "name" : "foo.bar.bat" }, - "nextConfiguration" : ["e"] - }, - { - "event" : { "name" : "foo" }, - "nextConfiguration" : ["e"] - }, - { - "event" : { "name" : "foo.bar.bat" }, - "nextConfiguration" : ["f"] - }, - { - "event" : { "name" : "foobar" }, - "nextConfiguration" : ["f"] - }, - { - "event" : { "name" : "foo.bar.bat.bif" }, - "nextConfiguration" : ["g"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "foo" }, + "nextConfiguration" : ["b"] + }, + { + "event" : { "name" : "foo.bar" }, + "nextConfiguration" : ["c"] + }, + { + "event" : { "name" : "foo.bar.bat" }, + "nextConfiguration" : ["d"] + }, + { + "event" : { "name" : "foo.bar.bat" }, + "nextConfiguration" : ["e"] + }, + { + "event" : { "name" : "foo" }, + "nextConfiguration" : ["e"] + }, + { + "event" : { "name" : "foo.bar.bat" }, + "nextConfiguration" : ["f"] + }, + { + "event" : { "name" : "foobar" }, + "nextConfiguration" : ["f"] + }, + { + "event" : { "name" : "foo.bar.bat.bif" }, + "nextConfiguration" : ["g"] + } + ] } diff --git a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test1.scxml b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test1.scxml index 9e7c4e3..4515b3a 100644 --- a/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test1.scxml +++ b/test/scxml-test-framework/test/scxml-prefix-event-name-matching/test1.scxml @@ -15,39 +15,39 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript" > + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> - <state id="a"> - <transition target="b" event="foo"/> - </state> + <state id="a"> + <transition target="b" event="foo"/> + </state> - <state id="b"> - <transition target="c" event="foo.bar"/> - </state> + <state id="b"> + <transition target="c" event="foo.bar"/> + </state> - <state id="c"> - <transition target="d" event="foo.bar.bat"/> - </state> + <state id="c"> + <transition target="d" event="foo.bar.bat"/> + </state> - <state id="d"> - <transition target="e" event="foo.*"/> - <transition target="fail" event="foo"/> - </state> + <state id="d"> + <transition target="e" event="foo.*"/> + <transition target="fail" event="foo"/> + </state> - <state id="e"> - <transition target="f" event="foo.bar.*"/> - <transition target="fail" event="foo.bar"/> - </state> + <state id="e"> + <transition target="f" event="foo.bar.*"/> + <transition target="fail" event="foo.bar"/> + </state> - <state id="f"> - <transition target="g" event="foo.bar.bat.*"/> - <transition target="fail" event="foo.bar.bat"/> - </state> + <state id="f"> + <transition target="g" event="foo.bar.bat.*"/> + <transition target="fail" event="foo.bar.bat"/> + </state> - <state id="g"/> + <state id="g"/> - <state id="fail"/> + <state id="fail"/> </scxml> diff --git a/test/scxml-test-framework/test/send-data/send1.json b/test/scxml-test-framework/test/send-data/send1.json index 0f7f7f3..f21ee8b 100644 --- a/test/scxml-test-framework/test/send-data/send1.json +++ b/test/scxml-test-framework/test/send-data/send1.json @@ -1,14 +1,15 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["b"] - }, - { - "after" : 100, - "event" : { "name" : "t2" }, - "nextConfiguration" : ["e"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["b"] + }, + { + "after" : 100, + "event" : { "name" : "t2" }, + "nextConfiguration" : ["e"] + } + ] } + diff --git a/test/scxml-test-framework/test/send-data/send1.scxml b/test/scxml-test-framework/test/send-data/send1.scxml index d150ad5..c663ce3 100644 --- a/test/scxml-test-framework/test/send-data/send1.scxml +++ b/test/scxml-test-framework/test/send-data/send1.scxml @@ -15,57 +15,59 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - datamodel="ecmascript"> - - <datamodel> - <data id="foo" expr="1"/> - <data id="bar" expr="2"/> - <data id="bat" expr="3"/> - </datamodel> - - <state id="a"> - <transition target="b" event="t"> - <send delayexpr="'10ms'" eventexpr="'s1'" namelist="foo bar"> - <param name="bif" location="bat"/> - <param name="belt" expr="4"/> - </send> - </transition> - </state> - - <state id="b"> - <transition event="s1" target="c" - cond="_event.data.foo === 1 && - _event.data.bar === 2 && - _event.data.bif === 3 && - _event.data.belt === 4"> - - <send delayexpr="'10ms'" eventexpr="'s2'"> - <content>More content.</content> - </send> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="foo" expr="1"/> + <data id="bar" expr="2"/> + <data id="bat" expr="3"/> + </datamodel> + + <state id="a"> + <transition target="b" event="t"> + <send delayexpr="'10ms'" eventexpr="'s1'" namelist="foo bar"> + <param name="bif" location="bat"/> + <param name="belt" expr="4"/> + </send> + </transition> + </state> + + <state id="b"> + <transition event="s1" target="c" + cond="_event.data.foo === 1 && + _event.data.bar === 2 && + _event.data.bif === 3 && + _event.data.belt === 4"> + + <send delayexpr="'10ms'" eventexpr="'s2'"> + <content>More content.</content> + </send> </transition> - <transition event="s1" target="f"/> - </state> + <transition event="s1" target="f"/> + </state> - <state id="c"> - <transition event="s2" target="d" - cond="_event.data === 'More content.'"/> + <state id="c"> + <transition event="s2" target="d" + cond="_event.data === 'More content.'"/> - <transition event="s2" target="f"/> - </state> + <transition event="s2" target="f"> + <log label="_event" expr="_event"/> + </transition> + </state> - <state id="d"> - <transition event="t2" target="e"/> - </state> + <state id="d"> + <transition event="t2" target="e"/> + </state> <state id="e"/> - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/send-internal/test0.json b/test/scxml-test-framework/test/send-internal/test0.json index 855e0ee..a7f8799 100644 --- a/test/scxml-test-framework/test/send-internal/test0.json +++ b/test/scxml-test-framework/test/send-internal/test0.json @@ -1,9 +1,9 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["d"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["d"] + } + ] } diff --git a/test/scxml-test-framework/test/send-internal/test0.scxml b/test/scxml-test-framework/test/send-internal/test0.scxml index 943322c..03ac96a 100644 --- a/test/scxml-test-framework/test/send-internal/test0.scxml +++ b/test/scxml-test-framework/test/send-internal/test0.scxml @@ -15,54 +15,54 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript"> - - <datamodel> - <data id="foo" expr="1"/> - <data id="bar" expr="2"/> - <data id="bat" expr="3"/> - </datamodel> - - <state id="a"> - <transition target="b" event="t"> - <send eventexpr="'s1'" namelist="foo bar" target="#_internal"> - <param name="bif" location="bat"/> - <param name="belt" expr="4"/> - </send> - </transition> - </state> - - <state id="b"> - <transition event="s1" target="c" - cond="_event.data.foo === 1 && - _event.data.bar === 2 && - _event.data.bif === 3 && - _event.data.belt === 4"> - - <send eventexpr="'s2'" target="#_internal"> - <content>More content.</content> - </send> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="foo" expr="1"/> + <data id="bar" expr="2"/> + <data id="bat" expr="3"/> + </datamodel> + + <state id="a"> + <transition target="b" event="t"> + <send eventexpr="'s1'" namelist="foo bar" target="#_internal"> + <param name="bif" location="bat"/> + <param name="belt" expr="4"/> + </send> + </transition> + </state> + + <state id="b"> + <transition event="s1" target="c" + cond="_event.data.foo === 1 && + _event.data.bar === 2 && + _event.data.bif === 3 && + _event.data.belt === 4"> + + <send eventexpr="'s2'" target="#_internal"> + <content>More content.</content> + </send> </transition> - <transition event="s1" target="f"/> - </state> + <transition event="s1" target="f"/> + </state> - <state id="c"> - <transition event="s2" target="d" - cond="_event.data === 'More content.'"/> + <state id="c"> + <transition event="s2" target="d" + cond="_event.data === 'More content.'"/> - <transition event="s2" target="f"> - <log label="_event" expr="_event"/> - </transition> - </state> + <transition event="s2" target="f"> + <log label="_event" expr="_event"/> + </transition> + </state> - <state id="d"/> + <state id="d"/> - <state id="f"/> + <state id="f"/> </scxml> diff --git a/test/scxml-test-framework/test/targetless-transition/test0.json b/test/scxml-test-framework/test/targetless-transition/test0.json index 91e35b6..43f1a91 100644 --- a/test/scxml-test-framework/test/targetless-transition/test0.json +++ b/test/scxml-test-framework/test/targetless-transition/test0.json @@ -1,11 +1,11 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "t" }, - "nextConfiguration" : ["done"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "t" }, + "nextConfiguration" : ["done"] + } + ] } diff --git a/test/scxml-test-framework/test/targetless-transition/test0.scxml b/test/scxml-test-framework/test/targetless-transition/test0.scxml index c1cd27d..5b95d73 100644 --- a/test/scxml-test-framework/test/targetless-transition/test0.scxml +++ b/test/scxml-test-framework/test/targetless-transition/test0.scxml @@ -15,25 +15,25 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript"> - - <datamodel> - <data id="i" expr="0"/> - </datamodel> - - <state id="a"> - <transition target="b" event="t"/> - </state> - - <state id="b"> - <transition target="done" cond="i === 100"/> - <transition> - <assign location="i" expr="i + 1"/> - </transition> - </state> - - <state id="done"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="i" expr="0"/> + </datamodel> + + <state id="a"> + <transition target="b" event="t"/> + </state> + + <state id="b"> + <transition target="done" cond="i === 100"/> + <transition> + <assign location="i" expr="i + 1"/> + </transition> + </state> + + <state id="done"/> </scxml> diff --git a/test/scxml-test-framework/test/targetless-transition/test1.json b/test/scxml-test-framework/test/targetless-transition/test1.json index 4ebbbd4..f82edf4 100644 --- a/test/scxml-test-framework/test/targetless-transition/test1.json +++ b/test/scxml-test-framework/test/targetless-transition/test1.json @@ -1,15 +1,15 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "foo" }, - "nextConfiguration" : ["a"] - }, - { - "event" : { "name" : "bar" }, - "nextConfiguration" : ["done"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "foo" }, + "nextConfiguration" : ["a"] + }, + { + "event" : { "name" : "bar" }, + "nextConfiguration" : ["done"] + } + ] } diff --git a/test/scxml-test-framework/test/targetless-transition/test1.scxml b/test/scxml-test-framework/test/targetless-transition/test1.scxml index f8f9f9f..11520bf 100644 --- a/test/scxml-test-framework/test/targetless-transition/test1.scxml +++ b/test/scxml-test-framework/test/targetless-transition/test1.scxml @@ -15,29 +15,29 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript"> - - <datamodel> - <data id="i" expr="1"/> - </datamodel> - - <state id="A"> - <transition event="foo"> - <assign location="i" expr="i * 2"/> - </transition> - - <state id="a"> - <transition event="bar"> - <assign location="i" expr="Math.pow(i,3)"/> - </transition> - </state> - - <transition target="done" cond="i === 8"/> - </state> - - <state id="done"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="i" expr="1"/> + </datamodel> + + <state id="A"> + <transition event="foo"> + <assign location="i" expr="i * 2"/> + </transition> + + <state id="a"> + <transition event="bar"> + <assign location="i" expr="Math.pow(i,3)"/> + </transition> + </state> + + <transition target="done" cond="i === 8"/> + </state> + + <state id="done"/> </scxml> diff --git a/test/scxml-test-framework/test/targetless-transition/test2.json b/test/scxml-test-framework/test/targetless-transition/test2.json index a37a4cc..f97a06f 100644 --- a/test/scxml-test-framework/test/targetless-transition/test2.json +++ b/test/scxml-test-framework/test/targetless-transition/test2.json @@ -1,15 +1,15 @@ { - "initialConfiguration" : ["a"], - "events" : [ - { - "event" : { "name" : "foo" }, - "nextConfiguration" : ["a"] - }, - { - "event" : { "name" : "bar" }, - "nextConfiguration" : ["done"] - } - ] + "initialConfiguration" : ["a"], + "events" : [ + { + "event" : { "name" : "foo" }, + "nextConfiguration" : ["a"] + }, + { + "event" : { "name" : "bar" }, + "nextConfiguration" : ["done"] + } + ] } diff --git a/test/scxml-test-framework/test/targetless-transition/test2.scxml b/test/scxml-test-framework/test/targetless-transition/test2.scxml index b6b3f5d..12609dd 100644 --- a/test/scxml-test-framework/test/targetless-transition/test2.scxml +++ b/test/scxml-test-framework/test/targetless-transition/test2.scxml @@ -15,32 +15,32 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript"> - - <datamodel> - <data id="i" expr="1"/> - </datamodel> - - <state id="A"> - <transition event="foo"> - <assign location="i" expr="i * 2"/> - </transition> - <transition event="bar"> - <assign location="i" expr="Math.pow(i,3)"/> - </transition> - - <state id="a"> - <transition event="foo"> - <assign location="i" expr="i + 2"/> - </transition> - </state> - - <transition target="done" cond="i === 27"/> - </state> - - <state id="done"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="i" expr="1"/> + </datamodel> + + <state id="A"> + <transition event="foo"> + <assign location="i" expr="i * 2"/> + </transition> + <transition event="bar"> + <assign location="i" expr="Math.pow(i,3)"/> + </transition> + + <state id="a"> + <transition event="foo"> + <assign location="i" expr="i + 2"/> + </transition> + </state> + + <transition target="done" cond="i === 27"/> + </state> + + <state id="done"/> </scxml> diff --git a/test/scxml-test-framework/test/targetless-transition/test3.json b/test/scxml-test-framework/test/targetless-transition/test3.json index a002827..f1300b1 100644 --- a/test/scxml-test-framework/test/targetless-transition/test3.json +++ b/test/scxml-test-framework/test/targetless-transition/test3.json @@ -1,15 +1,15 @@ { - "initialConfiguration" : ["a1","b1","c"], - "events" : [ - { - "event" : { "name" : "foo" }, - "nextConfiguration" : ["a2","b2","c"] - }, - { - "event" : { "name" : "bar" }, - "nextConfiguration" : ["done"] - } - ] + "initialConfiguration" : ["a1","b1","c"], + "events" : [ + { + "event" : { "name" : "foo" }, + "nextConfiguration" : ["a2","b2","c"] + }, + { + "event" : { "name" : "bar" }, + "nextConfiguration" : ["done"] + } + ] } diff --git a/test/scxml-test-framework/test/targetless-transition/test3.scxml b/test/scxml-test-framework/test/targetless-transition/test3.scxml index 9d3d630..3af50cc 100644 --- a/test/scxml-test-framework/test/targetless-transition/test3.scxml +++ b/test/scxml-test-framework/test/targetless-transition/test3.scxml @@ -15,57 +15,57 @@ limitations under the License. --> <scxml - xmlns="http://www.w3.org/2005/07/scxml" - version="1.0" - profile="ecmascript"> - - <datamodel> - <data id="i" expr="1"/> - </datamodel> - - <parallel id="p"> - - <transition target="done" cond="i === 100"/> - - <transition event="bar"> - <assign location="i" expr="i * 20"/> - <log expr="i"/> - </transition> - - <state id="a"> - <state id="a1"> - <transition event="foo" target="a2"> - <assign location="i" expr="i * 2"/> - <log expr="i"/> - </transition> - </state> - - <state id="a2"> - </state> - </state> - - <state id="b"> - <state id="b1"> - <transition event="foo" target="b2"> - <assign location="i" expr="Math.pow(i,3)"/> - <log expr="i"/> - </transition> - </state> - - <state id="b2"> - </state> - </state> - - <state id="c"> - <transition event="foo"> - <assign location="i" expr="i - 3"/> - <log expr="i"/> - </transition> - </state> - - </parallel> - - <state id="done"/> + datamodel="ecmascript" + xmlns="http://www.w3.org/2005/07/scxml" + version="1.0"> + + <datamodel> + <data id="i" expr="1"/> + </datamodel> + + <parallel id="p"> + + <transition target="done" cond="i === 100"/> + + <transition event="bar"> + <assign location="i" expr="i * 20"/> + <log expr="i"/> + </transition> + + <state id="a"> + <state id="a1"> + <transition event="foo" target="a2"> + <assign location="i" expr="i * 2"/> + <log expr="i"/> + </transition> + </state> + + <state id="a2"> + </state> + </state> + + <state id="b"> + <state id="b1"> + <transition event="foo" target="b2"> + <assign location="i" expr="Math.pow(i,3)"/> + <log expr="i"/> + </transition> + </state> + + <state id="b2"> + </state> + </state> + + <state id="c"> + <transition event="foo"> + <assign location="i" expr="i - 3"/> + <log expr="i"/> + </transition> + </state> + + </parallel> + + <state id="done"/> </scxml> diff --git a/test/src/scxml-test-framework-client.cpp b/test/src/scxml-test-framework-client.cpp index 841df0f..1eeab9c 100644 --- a/test/src/scxml-test-framework-client.cpp +++ b/test/src/scxml-test-framework-client.cpp @@ -1,5 +1,5 @@ #include "uscxml/Interpreter.h" -#include "uscxml/plugins/ioprocessor/basichttp/libevent/EventIOProcessor.h" +#include "uscxml/server/HTTPServer.h" #include <sstream> extern "C" { @@ -20,40 +20,19 @@ extern "C" { {"load":"http://localhost:9999/scxml-test-framework/test/targetless-transition/test3.scxml"} */ -class TestIOProcessor : public uscxml::EventIOProcessor, public uscxml::InterpreterMonitor { +class TestIOProcessor : public uscxml::HTTPServlet, public uscxml::InterpreterMonitor { public: - static int lastToken; - static std::map<std::string, std::pair<uscxml::Interpreter*, evhttp_request*> > _interpreters; + static bool alreadyAnswered; // we need this for delayed events + static std::map<std::string, std::pair<uscxml::Interpreter*, uscxml::HTTPServer::Request> > _interpreters; TestIOProcessor() {} - virtual void onStableConfiguration(uscxml::Interpreter* interpreter) { - Arabica::XPath::NodeSet<std::string> configuration = interpreter->getConfiguration(); - - uscxml::Data reply; - reply.compound["sessionToken"] = uscxml::Data(interpreter->getName()); - std::string seperator; - for (size_t i = 0; i < configuration.size(); i++) { - if (uscxml::Interpreter::isAtomic(configuration[i])) - reply.compound["nextConfiguration"].array.push_back(uscxml::Data(ATTR(configuration[i], "id"), uscxml::Data::VERBATIM)); - } - - std::cout << "---- reply:" << std::endl; - std::cout << reply << std::endl; - - std::stringstream replyString; - replyString << reply; - - struct evbuffer *databuf = evbuffer_new(); - evbuffer_add(databuf, replyString.str().c_str(), replyString.str().length()); - evhttp_send_reply(_interpreters[interpreter->getName()].second, 200, "OK", databuf); - evbuffer_free(databuf); - + virtual void beforeCompletion(uscxml::Interpreter* interpreter) { + _interpreters[interpreter->getName()].second.curlReq = NULL; } - virtual void beforeCompletion(uscxml::Interpreter* interpreter) {} virtual void afterCompletion(uscxml::Interpreter* interpreter) {} virtual void beforeMicroStep(uscxml::Interpreter* interpreter) {} virtual void beforeTakingTransitions(uscxml::Interpreter* interpreter, const Arabica::XPath::NodeSet<std::string>& transitions) {} @@ -65,6 +44,7 @@ public: } std::cout << std::endl; } + virtual void afterEnteringStates(uscxml::Interpreter* interpreter) { std::cout << "After entering states: "; for (int i = 0; i < interpreter->getConfiguration().size(); i++) { @@ -72,6 +52,7 @@ public: } std::cout << std::endl; } + virtual void beforeExitingStates(uscxml::Interpreter* interpreter, const Arabica::XPath::NodeSet<std::string>& statesToExit) { std::cout << "Configuration: "; for (int i = 0; i < interpreter->getConfiguration().size(); i++) { @@ -84,6 +65,7 @@ public: } std::cout << std::endl; } + virtual void afterExitingStates(uscxml::Interpreter* interpreter) { std::cout << "After exiting states: "; for (int i = 0; i < interpreter->getConfiguration().size(); i++) { @@ -92,37 +74,46 @@ public: std::cout << std::endl; } - virtual void httpRecvReq(struct evhttp_request *req) { - - std::cout << "---- received:" << std::endl; - - if (evhttp_request_get_command(req) != EVHTTP_REQ_POST) + virtual void onStableConfiguration(uscxml::Interpreter* interpreter) { + if (alreadyAnswered) return; - evhttp_request_own(req); - - struct evkeyval *header; - struct evkeyvalq *headers; - headers = evhttp_request_get_input_headers(req); + Arabica::XPath::NodeSet<std::string> configuration = interpreter->getConfiguration(); - for (header = headers->tqh_first; header; - header = header->next.tqe_next) { -// std::cout << header->key << ": " << header->value << std::endl; + uscxml::Data reply; + reply.compound["sessionToken"] = uscxml::Data(interpreter->getName()); + std::string seperator; + for (size_t i = 0; i < configuration.size(); i++) { + if (uscxml::Interpreter::isAtomic(configuration[i])) + reply.compound["nextConfiguration"].array.push_back(uscxml::Data(ATTR(configuration[i], "id"), uscxml::Data::VERBATIM)); } + + std::cout << "---- reply:" << std::endl; + std::cout << reply << std::endl; + + std::stringstream replyString; + replyString << reply; + + alreadyAnswered = true; + + uscxml::HTTPServer::Request httpRequest = _interpreters[interpreter->getName()].second; + uscxml::HTTPServer::Reply httpReply(httpRequest); + httpReply.content = replyString.str(); + uscxml::HTTPServer::reply(httpReply); + + } - std::string content; - struct evbuffer *buf; - buf = evhttp_request_get_input_buffer(req); - while (evbuffer_get_length(buf)) { - int n; - char cbuf[128]; - n = evbuffer_remove(buf, cbuf, sizeof(buf)-1); - if (n > 0) { - content.append(cbuf, n); - } - } + void httpRecvRequest(const uscxml::HTTPServer::Request& request) { + +// uscxml::HTTPServer::Reply httpReply(request); +// uscxml::HTTPServer::reply(httpReply); +// return; - uscxml::Data jsonReq = uscxml::Data::fromJSON(content); + std::cout << "---- received:" << std::endl; + evhttp_request_own(request.curlReq); + + std::cout << request.content << std::endl; + uscxml::Data jsonReq = uscxml::Data::fromJSON(request.content); std::cout << jsonReq << std::endl; @@ -130,6 +121,19 @@ public: if (jsonReq.compound.find("load") != jsonReq.compound.end()) { std::string filename = jsonReq.compound["load"].atom; std::cout << "Starting Interpreter with " << filename << std::endl; + alreadyAnswered = false; + + std::map<std::string, std::pair<uscxml::Interpreter*, uscxml::HTTPServer::Request> >::iterator interpreterIter = _interpreters.begin(); + while(interpreterIter != _interpreters.end()) { +// if (interpreterIter->second.second.curlReq == NULL) { + delete interpreterIter->second.first; + _interpreters.erase(interpreterIter++); +// } else { +// interpreterIter++; +// } + } + + uscxml::Interpreter* interpreter = uscxml::Interpreter::fromURI(filename); if (interpreter) { std::string token = uscxml::toStr(lastToken++); @@ -137,7 +141,7 @@ public: interpreter->setName(token); interpreter->addMonitor(this); interpreter->start(); - _interpreters[token] = std::make_pair(interpreter, req); + _interpreters[token] = std::make_pair(interpreter, request); } return; } @@ -151,33 +155,27 @@ public: event.name = jsonReq.compound["event"].compound["name"].atom; std::cout << "Sending event " << event << std::endl; // evhttp_request_free(_interpreters[token].second); - _interpreters[token].second = req; + alreadyAnswered = false; + _interpreters[token].second = request; _interpreters[token].first->receive(event); } - - } - - std::string getPath() { - return "test"; + } - + void setURL(const std::string& url) { std::cout << "Listening at " << url << std::endl; - _url = url; } }; int TestIOProcessor::lastToken; -std::map<std::string, std::pair<uscxml::Interpreter*, evhttp_request*> > TestIOProcessor::_interpreters; +bool TestIOProcessor::alreadyAnswered; +std::map<std::string, std::pair<uscxml::Interpreter*, uscxml::HTTPServer::Request> > TestIOProcessor::_interpreters; int main(int argc, char** argv) { TestIOProcessor* testServer = new TestIOProcessor(); - uscxml::EventIOServer::registerProcessor(testServer); + uscxml::HTTPServer::registerServlet("test", testServer); while(true) tthread::this_thread::sleep_for(tthread::chrono::milliseconds(20)); -// uscxml::Interpreter* interpreter = uscxml::Interpreter::fromURI(argv[1]); -// interpreter->dump(); -// interpreter->interpret(); }
\ No newline at end of file diff --git a/test/src/test-communication.cpp b/test/src/test-communication.cpp.old index a0cdbbd..a0cdbbd 100644 --- a/test/src/test-communication.cpp +++ b/test/src/test-communication.cpp.old diff --git a/test/src/test-completion.cpp b/test/src/test-completion.cpp.old index 67d8708..67d8708 100644 --- a/test/src/test-completion.cpp +++ b/test/src/test-completion.cpp.old diff --git a/test/src/test-curl-multi-api.cpp b/test/src/test-curl-multi-api.cpp new file mode 100644 index 0000000..fac06dc --- /dev/null +++ b/test/src/test-curl-multi-api.cpp @@ -0,0 +1,347 @@ +#include <curl/curl.h> +#include <glog/logging.h> +#include <string> +#include <iostream> +#include <sstream> +#include <map> +#include <set> +#include <boost/shared_ptr.hpp> +#include <boost/enable_shared_from_this.hpp> + +#include "uscxml/concurrency/tinythread.h" + +// use arabica URL parser +#include <io/uri.hpp> + +class URL; + +class URLMonitor { +public: + virtual void downloadStarted(const URL& url) {}; + virtual void downloadCompleted(const URL& url) {}; + virtual void downloadFailed(const URL& url, int errorCode) {}; + virtual void headerChunkReceived(const URL& url, const std::string& headerChunk) {}; + virtual void contentChunkReceived(const URL& url, const std::string& contentChunk) {}; +}; + +class URLImpl : public boost::enable_shared_from_this<URLImpl> { +public: + URLImpl(const std::string& url) : _handle(NULL), _uri(url), _isDownloaded(false) { + _handle = curl_easy_init(); + if (_handle != NULL) { + CURLcode curlError; + curlError = curl_easy_setopt(_handle, CURLOPT_URL, _uri.as_string().c_str()); + if (curlError != CURLE_OK) + LOG(ERROR) << "Cannot set url to " << _uri.as_string() << ": " << curl_easy_strerror(curlError); + + curlError = curl_easy_setopt(_handle, CURLOPT_WRITEDATA, this); + if (curlError != CURLE_OK) + LOG(ERROR) << "Cannot register this as write userdata: " << curl_easy_strerror(curlError); + + curlError = curl_easy_setopt(_handle, CURLOPT_WRITEFUNCTION, URLImpl::writeHandler); + if (curlError != CURLE_OK) + LOG(ERROR) << "Cannot set write callback: " << curl_easy_strerror(curlError); + + curlError = curl_easy_setopt(_handle, CURLOPT_HEADERFUNCTION, URLImpl::headerHandler); + if (curlError != CURLE_OK) + LOG(ERROR) << "Cannot request header from curl: " << curl_easy_strerror(curlError); + + curlError = curl_easy_setopt(_handle, CURLOPT_HEADERDATA, this); + if (curlError != CURLE_OK) + LOG(ERROR) << "Cannot register this as header userdata: " << curl_easy_strerror(curlError); + } else { + LOG(ERROR) << "curl_easy_init returned NULL, this is bad!"; + } + } + + ~URLImpl() { + if (_handle != NULL) + curl_easy_cleanup(_handle); + } + + static size_t writeHandler(void *ptr, size_t size, size_t nmemb, void *userdata) { + URLImpl* url = (URLImpl*)userdata; + url->_content.write((char*)ptr, size * nmemb); + return size * nmemb; + } + + static size_t headerHandler(void *ptr, size_t size, size_t nmemb, void *userdata) { + URLImpl* url = (URLImpl*)userdata; + url->_header.write((char*)ptr, size * nmemb); + return size * nmemb; + } + + void addMonitor(URLMonitor* monitor) { _monitors.insert(monitor); } + void removeMonitor(URLMonitor* monitor) { _monitors.erase(monitor); } + + const bool isAbsolute() const { return _uri.is_absolute(); } + const std::string scheme() const { return _uri.scheme(); } + const std::string host() const { return _uri.host(); } + const std::string port() const { return _uri.port(); } + const std::string path() const { return _uri.path(); } + const std::string asString() const { return _uri.as_string(); } + + void downloadStarted() { + std::cout << "Starting download of " << asString() << std::endl; + _content.str(""); + _content.clear(); + _header.str(""); + _header.clear(); + monIter_t monIter = _monitors.begin(); + while(monIter != _monitors.end()) { +// (*monIter)->downloadStarted(URL(shared_from_this())); + monIter++; + } + } + + void downloadCompleted() { + std::cout << "Finished loading " << asString() << " with " << _content.str().size() << " bytes" << std::endl; + _isDownloaded = true; + } + + void downloadFailed(int errorCode) { + std::cout << "FAILED!" << strerror(errorCode) << std::endl; + } + + std::string getHeader(bool forceReload = false) { + return _header.str(); + } + + std::string getContent(bool forceReload = false) { + return _content.str(); + } + + std::stringstream _content; + std::stringstream _header; + CURL* _handle; + Arabica::io::URI _uri; + bool _isDownloaded; + + std::set<URLMonitor*> _monitors; + typedef std::set<URLMonitor*>::iterator monIter_t; +}; + +class URL { +public: + URL() : _impl() {} + URL(const std::string url) : _impl(new URLImpl(url)) {} + URL(boost::shared_ptr<URLImpl> const impl) : _impl(impl) { } + URL(const URL& other) : _impl(other._impl) { } + virtual ~URL() {}; + + operator bool() const { return _impl; } + bool operator< (const URL& other) const { return _impl < other._impl; } + bool operator==(const URL& other) const { return _impl == other._impl; } + bool operator!=(const URL& other) const { + return _impl != other._impl; + } + URL& operator= (const URL& other) { + _impl = other._impl; + return *this; + } + + std::string getHeader() { return _impl->getHeader(); } + std::string getContent() { return _impl->getContent(); } + + const bool toAbsoluteCwd() { return _impl->toAbsoluteCwd(); } + const bool toAbsolute(const std::string& baseUrl) { return _impl->toAbsolute(baseUrl); } + const bool toAbsolute(const URL& baseUrl) { return _impl->toAbsolute(baseUrl.asString()); } + const std::string asLocalFile(const std::string& suffix, bool reload = false) { return _impl->asLocalFile(suffix, reload); } + + void addMonitor(URLMonitor* monitor) { _impl->addMonitor(monitor); } + void removeMonitor(URLMonitor* monitor) { _impl->removeMonitor(monitor); } + + const bool isAbsolute() const { return _impl->isAbsolute(); } + const std::string scheme() const { return _impl->scheme(); } + const std::string host() const { return _impl->host(); } + const std::string port() const { return _impl->port(); } + const std::string path() const { return _impl->path(); } + const std::string asString() const { return _impl->asString(); } + + friend class URLFetcher; + friend std::ostream & operator<<(std::ostream &stream, const URL& p); + +protected: + void downloadStarted() { return _impl->downloadStarted(); } + void downloadCompleted() { return _impl->downloadCompleted(); } + void downloadFailed(int errorCode) { return _impl->downloadFailed(errorCode); } + + boost::shared_ptr<URLImpl> _impl; +}; + +class URLFetcher { +public: + URLFetcher() { + _multiHandle = curl_multi_init(); + start(); + } + + ~URLFetcher() { + curl_multi_cleanup(_multiHandle); + stop(); + } + + void fetchURL(URL& url) { + tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); + url.downloadStarted(); + _handlesToURLs[url._impl->_handle] = url; + curl_multi_add_handle(_multiHandle, url._impl->_handle); + _condVar.notify_all(); + } + + void breakURL(URL& url) { + tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); + if (_handlesToURLs.find(url._impl->_handle) != _handlesToURLs.end()) { + url.downloadFailed(0); + curl_multi_remove_handle(_multiHandle, url._impl->_handle); + _handlesToURLs.erase(url._impl->_handle); + } + } + + void start() { + tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); + if (!_isStarted) { + _isStarted = true; + _thread = new tthread::thread(URLFetcher::run, this); + } + } + + void stop() { + tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); + if (_isStarted) { + _isStarted = false; + _thread->join(); + delete _thread; + } + } + + static void run(void* instance) { + URLFetcher* THIS = (URLFetcher*)instance; + THIS->_mutex.lock(); + while(THIS->_isStarted) { + if(THIS->_handlesToURLs.size() > 0) { + THIS->_mutex.unlock(); + THIS->perform(); + THIS->_mutex.lock(); + } + THIS->_condVar.wait(THIS->_mutex); + } + THIS->_mutex.unlock(); + } + + void perform() { + + CURLMsg *msg; /* for picking up messages with the transfer status */ + int msgsLeft; /* how many messages are left */ + int stillRunning; + + { + tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); + curl_multi_perform(_multiHandle, &stillRunning); + } + + do { + struct timeval timeout; + int rc; /* select() return code */ + + fd_set fdread, fdwrite, fdexcep; + FD_ZERO(&fdread); FD_ZERO(&fdwrite); FD_ZERO(&fdexcep); + + int maxfd = -1; + long curlTimeOut = -1; + + /* set a suitable timeout to play around with */ + timeout.tv_sec = 1; + timeout.tv_usec = 0; + + { + tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); + curl_multi_timeout(_multiHandle, &curlTimeOut); + } + + if(curlTimeOut >= 0) { + timeout.tv_sec = curlTimeOut / 1000; + if(timeout.tv_sec > 1) + timeout.tv_sec = 1; + else + timeout.tv_usec = (curlTimeOut % 1000) * 1000; + } + + /* get file descriptors from the transfers */ + { + tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); + curl_multi_fdset(_multiHandle, &fdread, &fdwrite, &fdexcep, &maxfd); + } + + rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout); + + switch(rc) { + case -1: + /* select error */ + break; + case 0: /* timeout */ + default: /* action */ + { + tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); + curl_multi_perform(_multiHandle, &stillRunning); + } + break; + } + + { + tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); + while ((msg = curl_multi_info_read(_multiHandle, &msgsLeft))) { + if (msg->msg == CURLMSG_DONE) { + _handlesToURLs[msg->easy_handle].downloadCompleted(); + curl_multi_remove_handle(_multiHandle, msg->easy_handle); + _handlesToURLs.erase(msg->easy_handle); + } else { + switch (msg->data.result) { + case CURLM_OK: + break; + case CURLM_BAD_HANDLE: + case CURLM_BAD_EASY_HANDLE: + case CURLM_OUT_OF_MEMORY: + case CURLM_INTERNAL_ERROR: + case CURLM_BAD_SOCKET: + case CURLM_UNKNOWN_OPTION: + case CURLM_LAST: + _handlesToURLs[msg->easy_handle].downloadFailed(msg->data.result); + curl_multi_remove_handle(_multiHandle, msg->easy_handle); + _handlesToURLs.erase(msg->easy_handle); + default: + break; + } + } + } + } + } while(stillRunning && _isStarted); + + } + + tthread::condition_variable _condVar; + tthread::thread* _thread; + tthread::recursive_mutex _mutex; + bool _isStarted; + + std::map<CURL*, URL> _handlesToURLs; + CURLM* _multiHandle; +}; + + +int main(int argc, char** argv) { + URLFetcher fetcher; + URL heise("http://www.heise.de"); + URL localFile("file:///Users/sradomski/Desktop/scxml.xsd"); + URL slashdot("http://slashdot.org"); + URL asdf("daf://localhost:234"); + URL bahn("http://www.bahn.de"); + + fetcher.fetchURL(heise); + fetcher.fetchURL(localFile); + fetcher.fetchURL(asdf); + fetcher.fetchURL(slashdot); + fetcher.fetchURL(bahn); + + while(1) {} +}
\ No newline at end of file diff --git a/test/src/test-ecmascript-v8.cpp b/test/src/test-ecmascript-v8.cpp.old index 9ce39d9..9ce39d9 100644 --- a/test/src/test-ecmascript-v8.cpp +++ b/test/src/test-ecmascript-v8.cpp.old diff --git a/test/src/test-execution.cpp b/test/src/test-execution.cpp.old index 272ce41..272ce41 100644 --- a/test/src/test-execution.cpp +++ b/test/src/test-execution.cpp.old diff --git a/test/src/test-prolog-swi.cpp b/test/src/test-prolog-swi.cpp.old index 9e44f12..9e44f12 100644 --- a/test/src/test-prolog-swi.cpp +++ b/test/src/test-prolog-swi.cpp.old |