summaryrefslogtreecommitdiffstats
path: root/test/samples/uscxml
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2012-12-21 18:07:27 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2012-12-21 18:07:27 (GMT)
commit93d0fee20cafb44b3de2fb2faa88bc13f739d295 (patch)
tree53aa62bd0437a1d947da9f010f49bc7b9328d24b /test/samples/uscxml
parent501e7730acc35934dee481207a7a6c6575b1b342 (diff)
downloaduscxml-93d0fee20cafb44b3de2fb2faa88bc13f739d295.zip
uscxml-93d0fee20cafb44b3de2fb2faa88bc13f739d295.tar.gz
uscxml-93d0fee20cafb44b3de2fb2faa88bc13f739d295.tar.bz2
Fixed tests again
Diffstat (limited to 'test/samples/uscxml')
-rw-r--r--test/samples/uscxml/test-communication.scxml6
-rw-r--r--test/samples/uscxml/test-ecmascript.scxml8
-rw-r--r--test/samples/uscxml/test-invoked.scxml3
3 files changed, 12 insertions, 5 deletions
diff --git a/test/samples/uscxml/test-communication.scxml b/test/samples/uscxml/test-communication.scxml
index 610f8cc..8b1b380 100644
--- a/test/samples/uscxml/test-communication.scxml
+++ b/test/samples/uscxml/test-communication.scxml
@@ -4,9 +4,9 @@
<!-- Setup datamodel, print environment and send ourself an event to transition to next state -->
<datamodel>
- <data id="invokeconfig">
+ <!--data id="invokeconfig">
<invoker id="scxml" name="http://www.w3.org/TR/scxml/" location="_runtime" />
- </data>
+ </data -->
<data id="foo" expr="'this is the foo data'" />
<data id="bar" expr="'this is the bar data'" />
</datamodel>
@@ -15,7 +15,7 @@
<log expr="'Entered step1'" />
<log expr="'Sending ourself an event with data via basichttp'" />
<send targetexpr="_ioprocessors['basichttp'].location" namelist="foo" type="basichttp" event="transitionToNext">
- <param name="bar" expr="'b' + 'ar'" />
+ <param name="bar" expr="bar" />
<content>
<![CDATA[
This is some content you got there dude!
diff --git a/test/samples/uscxml/test-ecmascript.scxml b/test/samples/uscxml/test-ecmascript.scxml
index 7dfd94c..aa88f17 100644
--- a/test/samples/uscxml/test-ecmascript.scxml
+++ b/test/samples/uscxml/test-ecmascript.scxml
@@ -77,7 +77,13 @@
</foreach>
</foreach>
</onentry>
- <transition target="datamodels" />
+ <transition target="externalEvents" />
+ </state>
+ <state id="externalEvents">
+ <onentry>
+ <log expr="'-- External Events'" />
+ </onentry>
+ <transition target="datamodels" event="event1" cond="_event.name == 'event1'" />
</state>
<state id="datamodels">
<datamodel>
diff --git a/test/samples/uscxml/test-invoked.scxml b/test/samples/uscxml/test-invoked.scxml
index 7cd0d72..2781d31 100644
--- a/test/samples/uscxml/test-invoked.scxml
+++ b/test/samples/uscxml/test-invoked.scxml
@@ -1,8 +1,9 @@
+<!-- This is invoked in test-communications.scxml from a scxml invoker -->
<scxml datamodel="ecmascript">
<state id="start">
<onentry>
<log expr="'Message from the invoked scxml interpreter'" />
- <send target="_parent" event="transitionToNext" />
+ <send target="#_parent" event="transitionToNext" />
</onentry>
</state>
</scxml> \ No newline at end of file