diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-12-05 11:06:09 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-12-05 11:06:09 (GMT) |
commit | a5a139f46438148901ea6627b73d1bf6ae39b346 (patch) | |
tree | e043df6e22113184477a5ffb507f8ef14b7485e6 /test | |
parent | af6609592298c5e047e37e5ae2b47e6a8edbb677 (diff) | |
download | uscxml-a5a139f46438148901ea6627b73d1bf6ae39b346.zip uscxml-a5a139f46438148901ea6627b73d1bf6ae39b346.tar.gz uscxml-a5a139f46438148901ea6627b73d1bf6ae39b346.tar.bz2 |
Support for initial attribute with nested scxml invokers
Diffstat (limited to 'test')
-rw-r--r-- | test/ctest/CTestCustom.ctest.in | 15 | ||||
-rw-r--r-- | test/uscxml/test-initial-configuration.scxml | 41 | ||||
-rw-r--r-- | test/w3c/confPromela.xsl | 4 | ||||
-rw-r--r-- | test/w3c/promela/test510.scxml | 2 | ||||
-rw-r--r-- | test/w3c/promela/test522.scxml | 2 |
5 files changed, 51 insertions, 13 deletions
diff --git a/test/ctest/CTestCustom.ctest.in b/test/ctest/CTestCustom.ctest.in index 484dcb2..1362ea5 100644 --- a/test/ctest/CTestCustom.ctest.in +++ b/test/ctest/CTestCustom.ctest.in @@ -63,8 +63,6 @@ set(CTEST_CUSTOM_TESTS_IGNORE "spin/promela/test151.scxml" # test that foreach causes a new variable to be declared "spin/promela/test152.scxml" # test that an illegal array or item value causes error.execution "spin/promela/test156.scxml" # test that an error causes the foreach to stop execution - # "spin/promela/test172.scxml" # targetexpr _internal - can we support? - "spin/promela/test224.scxml" # string operation startWith "spin/promela/test224.scxml" # string operation startWith "spin/promela/test277.scxml" # platform creates unbound variable if we assign an illegal value to it "spin/promela/test280.scxml" # late data binding / undeclared variable @@ -84,7 +82,6 @@ set(CTEST_CUSTOM_TESTS_IGNORE "spin/promela/test325.scxml" # assignment from _ioprocessor "spin/promela/test326.scxml" # assignment from _ioprocessor "spin/promela/test329.scxml" # test that none of the system variables can be modified - "spin/promela/test331.scxml" # assigment to a non-declared var "spin/promela/test344.scxml" # 'return' as a cond "spin/promela/test346.scxml" # assignment to system variables "spin/promela/test350.scxml" # string concatenation @@ -101,33 +98,29 @@ set(CTEST_CUSTOM_TESTS_IGNORE "spin/promela/test525.scxml" # assumes unbound arrays "spin/promela/test530.scxml" # assigns DOM node to variable "spin/promela/test534.scxml" # string operation contains - + # fail for semantics "spin/promela/test159.scxml" # error raised causes all subsequent elements to be skipped "spin/promela/test178.scxml" # manual test with two identical params - failed "spin/promela/test194.scxml" # illegal target for send "spin/promela/test199.scxml" # invalid send type - "spin/promela/test207.scxml" # delay / cancel / nested SCXML "spin/promela/test215.scxml" # nested SCXML document with typeexpr at invoke "spin/promela/test216.scxml" # nested SCXML document with srcexpr at invoke "spin/promela/test230.scxml" # nested SCXML document with manual test "spin/promela/test298.scxml" # non-existent data model location - "spin/promela/test332.scxml" # sendid is present in error events - "spin/promela/test338.scxml" # test that invokeid is set correctly + "spin/promela/test331.scxml" # tests _error.type via 'error.execution' + "spin/promela/test332.scxml" # tests _error.sendid via 'error.execution' "spin/promela/test343.scxml" # test that illegal <param> produces error.execution "spin/promela/test488.scxml" # illegal expr in <param> produces error.execution "spin/promela/test496.scxml" # tests error.communication with illegal target "spin/promela/test500.scxml" # uses _ioprocessors.scxml.location - "spin/promela/test510.scxml" # uses _ioprocessors.basichttp.location + "spin/promela/test513.txt" # pure manual wget "spin/promela/test521.scxml" # tests error.communication with illegal target - "spin/promela/test522.scxml" # uses _ioprocessors.basichttp.location "spin/promela/test528.scxml" # illegal 'expr' produces error.execution "spin/promela/test531.scxml" # uses _ioprocessors.basichttp.location "spin/promela/test532.scxml" # uses _ioprocessors.basichttp.location - "spin/promela/test552.scxml" # initialize data from file "spin/promela/test553.scxml" # error in namelist "spin/promela/test554.scxml" # evaluation of <invoke>'s args causes an error - "spin/promela/test567.scxml" # uses _ioprocessors.basichttp.location "spin/promela/test577.scxml" # send without target for basichttp diff --git a/test/uscxml/test-initial-configuration.scxml b/test/uscxml/test-initial-configuration.scxml new file mode 100644 index 0000000..87c5796 --- /dev/null +++ b/test/uscxml/test-initial-configuration.scxml @@ -0,0 +1,41 @@ +<scxml> + <state id="s0"> + <invoke type="scxml" initial="s0pass s1pass"> + <content> + <scxml> + <parallel> + <state id="s0"> + <state id="s0fail"> + <onentry> + <log expr="s0fail!" /> + </onentry> + <transition target="quit" /> + </state> + <state id="s0pass"> + <onentry> + <log expr="s0pass!" /> + </onentry> + <transition target="quit" /> + </state> + </state> + <state id="s1"> + <state id="s1fail"> + <onentry> + <log expr="s1fail!" /> + </onentry> + <transition target="quit" /> + </state> + <state id="s1pass"> + <onentry> + <log expr="s1pass!" /> + <transition target="quit" /> + </onentry> + </state> + </state> + </parallel> + <final id="quit" /> + </scxml> + </content> + </invoke> + </state> +</scxml>
\ No newline at end of file diff --git a/test/w3c/confPromela.xsl b/test/w3c/confPromela.xsl index e9094d8..ee67755 100644 --- a/test/w3c/confPromela.xsl +++ b/test/w3c/confPromela.xsl @@ -136,6 +136,10 @@ <send xmlns="http://www.w3.org/2005/07/scxml" delay="20000" event="timeout"/> </xsl:template> +<xsl:template match="//scxml:send[@delay='30s'][@event='timeout']" priority="6"> + <send xmlns="http://www.w3.org/2005/07/scxml" delay="30000" event="timeout"/> +</xsl:template> + <!-- expr is evaluated --> <xsl:template match="//@conf:expr"> diff --git a/test/w3c/promela/test510.scxml b/test/w3c/promela/test510.scxml index fbb2f25..3ddda76 100644 --- a/test/w3c/promela/test510.scxml +++ b/test/w3c/promela/test510.scxml @@ -3,7 +3,7 @@ <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0"> <state id="s0"> <onentry> - <send event="timeout" delay="30s"/> + <send event="timeout" delay="30000"/> <send event="test" targetexpr="_ioprocessors.basichttp.location" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/> <!-- this creates an internal event --> <raise event="internal"/> diff --git a/test/w3c/promela/test522.scxml b/test/w3c/promela/test522.scxml index e31c289..d56f257 100644 --- a/test/w3c/promela/test522.scxml +++ b/test/w3c/promela/test522.scxml @@ -4,7 +4,7 @@ to send a message to the processor --> <scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="promela" version="1.0"> <state id="s0"> <onentry> - <send event="timeout" delay="30s"/> + <send event="timeout" delay="30000"/> <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location"/> </onentry> <!-- the event we receive should be called 'test', but that's not actually |