summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/src/test-w3c.cpp2
-rw-r--r--test/w3c/lua/test201.scxml2
-rw-r--r--test/w3c/lua/test496.scxml2
-rw-r--r--test/w3c/lua/test500.scxml2
-rw-r--r--test/w3c/lua/test501.scxml2
-rw-r--r--test/w3c/lua/test509.scxml4
-rw-r--r--test/w3c/lua/test510.scxml2
-rw-r--r--test/w3c/lua/test518.scxml2
-rw-r--r--test/w3c/lua/test519.scxml2
-rw-r--r--test/w3c/lua/test520.scxml6
-rw-r--r--test/w3c/lua/test521.scxml2
-rw-r--r--test/w3c/lua/test522.scxml2
-rw-r--r--test/w3c/lua/test531.scxml2
-rw-r--r--test/w3c/lua/test532.scxml2
-rw-r--r--test/w3c/lua/test534.scxml2
-rw-r--r--test/w3c/lua/test553.scxml2
-rw-r--r--test/w3c/lua/test554.scxml2
-rw-r--r--test/w3c/lua/test567.scxml2
18 files changed, 21 insertions, 21 deletions
diff --git a/test/src/test-w3c.cpp b/test/src/test-w3c.cpp
index 4060ef0..65b56dd 100644
--- a/test/src/test-w3c.cpp
+++ b/test/src/test-w3c.cpp
@@ -196,7 +196,7 @@ int main(int argc, char** argv) {
if (withFlattening) {
Interpreter flatInterpreter = Interpreter::fromURI(documentURI);
interpreter = Interpreter::fromDOM(ChartToFSM::flatten(flatInterpreter).getDocument(), flatInterpreter.getNameSpaceInfo());
- interpreter.setNameSpaceInfo(interpreter.getNameSpaceInfo());
+ interpreter.setSourceURI(flatInterpreter.getSourceURI());
} else {
interpreter = Interpreter::fromURI(documentURI);
}
diff --git a/test/w3c/lua/test201.scxml b/test/w3c/lua/test201.scxml
index f5f30f6..e1d6fe7 100644
--- a/test/w3c/lua/test201.scxml
+++ b/test/w3c/lua/test201.scxml
@@ -4,7 +4,7 @@ test since platforms are not required to support basic http event i/o -->
<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="lua">
<state id="s0">
<onentry>
- <send type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" event="event1" targetexpr="FIXME"/>
+ <send type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" event="event1" targetexpr="_ioprocessors.basichttp.location"/>
<send event="timeout"/>
</onentry>
<transition event="event1" target="pass"/>
diff --git a/test/w3c/lua/test496.scxml b/test/w3c/lua/test496.scxml
index ab5a2c0..855788b 100644
--- a/test/w3c/lua/test496.scxml
+++ b/test/w3c/lua/test496.scxml
@@ -2,7 +2,7 @@
<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="lua">
<state id="s0">
<onentry>
- <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" event="event" target="FIXME"/>
+ <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" event="event" target="#_scxml_foo"/>
<raise event="foo"/>
</onentry>
<transition event="error.communication" target="pass"/>
diff --git a/test/w3c/lua/test500.scxml b/test/w3c/lua/test500.scxml
index 527d36d..5139001 100644
--- a/test/w3c/lua/test500.scxml
+++ b/test/w3c/lua/test500.scxml
@@ -2,7 +2,7 @@
<!-- test that location field is found inside entry for SCXML Event I/O processor -->
<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="lua">
<datamodel>
- <data expr="FIXME" id="testvar1"/>
+ <data expr="_ioprocessors['http://www.w3.org/TR/scxml/#SCXMLEventProcessor'].location" id="testvar1"/>
</datamodel>
<state id="s0">
<transition cond="testvar1 ~= nil" target="pass"/>
diff --git a/test/w3c/lua/test501.scxml b/test/w3c/lua/test501.scxml
index d54f700..e83faca 100644
--- a/test/w3c/lua/test501.scxml
+++ b/test/w3c/lua/test501.scxml
@@ -2,7 +2,7 @@
<!-- test that the location entry for the SCXML Event I/O processor can be used as the target for an event -->
<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="lua">
<datamodel>
- <data expr="FIXME" id="testvar1"/>
+ <data expr="_ioprocessors['http://www.w3.org/TR/scxml/#SCXMLEventProcessor'].location" id="testvar1"/>
</datamodel>
<state id="s0">
<onentry>
diff --git a/test/w3c/lua/test509.scxml b/test/w3c/lua/test509.scxml
index 8dd27c5..f2cce85 100644
--- a/test/w3c/lua/test509.scxml
+++ b/test/w3c/lua/test509.scxml
@@ -5,10 +5,10 @@ at the accessURI -->
<state id="s0">
<onentry>
<send event="timeout" delay="30s"/>
- <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="FIXME"/>
+ <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location"/>
</onentry>
<!-- if the event was send by http and we get it, we succeed -->
- <transition event="test" cond="_event.httpmethod=='POST'" target="pass"/>
+ <transition event="test" cond="_event.name=='http.post'" target="pass"/>
<transition event="*" target="fail"/>
</state>
<final id="pass"/>
diff --git a/test/w3c/lua/test510.scxml b/test/w3c/lua/test510.scxml
index 2ccd802..f00b8a4 100644
--- a/test/w3c/lua/test510.scxml
+++ b/test/w3c/lua/test510.scxml
@@ -4,7 +4,7 @@
<state id="s0">
<onentry>
<send event="timeout" delay="30s"/>
- <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="FIXME"/>
+ <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location"/>
<!-- this creates an internal event -->
<raise event="internal"/>
</onentry>
diff --git a/test/w3c/lua/test518.scxml b/test/w3c/lua/test518.scxml
index 35b0db6..14576ed 100644
--- a/test/w3c/lua/test518.scxml
+++ b/test/w3c/lua/test518.scxml
@@ -7,7 +7,7 @@
<state id="s0">
<onentry>
<send event="timeout" delay="30s"/>
- <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" namelist="testvar1" targetexpr="FIXME"/>
+ <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" namelist="testvar1" targetexpr="_ioprocessors.basichttp.location"/>
</onentry>
<transition event="test" cond="_event.data.testvar1==2" target="pass"/>
<transition event="*" target="fail"/>
diff --git a/test/w3c/lua/test519.scxml b/test/w3c/lua/test519.scxml
index 0287f8a..1f4c71a 100644
--- a/test/w3c/lua/test519.scxml
+++ b/test/w3c/lua/test519.scxml
@@ -4,7 +4,7 @@
<state id="s0">
<onentry>
<send event="timeout" delay="30s"/>
- <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="FIXME">
+ <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location">
<param name="param1" expr="1"/>
</send>
</onentry>
diff --git a/test/w3c/lua/test520.scxml b/test/w3c/lua/test520.scxml
index 2e2e356..6e8cf7c 100644
--- a/test/w3c/lua/test520.scxml
+++ b/test/w3c/lua/test520.scxml
@@ -4,14 +4,14 @@
<state id="s0">
<onentry>
<send event="timeout" delay="30s"/>
- <send type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="FIXME">
+ <send type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location">
<content>this is some content</content>
</send>
</onentry>
<!-- if other end sends us back this event, we succeed. Test for two common
ways of encoding -->
- <transition event="HTTP.POST" cond="_event.httpresponse=='this+is+some+content'" target="pass"/>
- <transition event="HTTP.POST" cond="_event.httpresponse=='this%20is%20some%20content'" target="pass"/>
+ <transition event="HTTP.POST" cond="_event.raw=='this+is+some+content'" target="pass"/>
+ <transition event="HTTP.POST" cond="_event.raw=='this%20is%20some%20content'" target="pass"/>
<transition event="*" target="fail"/>
</state>
<final id="pass"/>
diff --git a/test/w3c/lua/test521.scxml b/test/w3c/lua/test521.scxml
index 5c79990..db23444 100644
--- a/test/w3c/lua/test521.scxml
+++ b/test/w3c/lua/test521.scxml
@@ -6,7 +6,7 @@ the error event, we succeed. Otherwise we eventually timeout and fail. -->
<state id="s0">
<onentry>
<!-- should cause an error -->
- <send event="event2" target="FIXME"/>
+ <send event="event2" targetexpr="#_scxml_foo"/>
<!-- this will get added to the external event queue after the error has been raised -->
<send event="timeout"/>
</onentry>
diff --git a/test/w3c/lua/test522.scxml b/test/w3c/lua/test522.scxml
index 18db5f0..152c945 100644
--- a/test/w3c/lua/test522.scxml
+++ b/test/w3c/lua/test522.scxml
@@ -5,7 +5,7 @@ to send a message to the processor -->
<state id="s0">
<onentry>
<send event="timeout" delay="30s"/>
- <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="FIXME"/>
+ <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
required for this test. Only that the send deliver some event to us. So if
diff --git a/test/w3c/lua/test531.scxml b/test/w3c/lua/test531.scxml
index 36d8301..c2a98ff 100644
--- a/test/w3c/lua/test531.scxml
+++ b/test/w3c/lua/test531.scxml
@@ -5,7 +5,7 @@ of the raised event. -->
<state id="s0">
<onentry>
<send event="timeout" delay="3s"/>
- <send type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="FIXME">
+ <send type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location">
<param name="_scxmleventname" expr="'test'"/>
</send>
</onentry>
diff --git a/test/w3c/lua/test532.scxml b/test/w3c/lua/test532.scxml
index e9514a4..ca83985 100644
--- a/test/w3c/lua/test532.scxml
+++ b/test/w3c/lua/test532.scxml
@@ -5,7 +5,7 @@ as the name of the resulting event. -->
<state id="s0">
<onentry>
<send event="timeout" delay="3s"/>
- <send type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="FIXME">
+ <send type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location">
<!-- this content will be ignored, but it's here to make sure we have a message body -->
<content>some content</content>
</send>
diff --git a/test/w3c/lua/test534.scxml b/test/w3c/lua/test534.scxml
index c206bc0..42f5f2f 100644
--- a/test/w3c/lua/test534.scxml
+++ b/test/w3c/lua/test534.scxml
@@ -4,7 +4,7 @@
<state id="s0">
<onentry>
<send event="timeout" delay="30s"/>
- <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="FIXME">
+ <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location">
</send>
</onentry>
<!-- if other end sends us back this event, we succeed -->
diff --git a/test/w3c/lua/test553.scxml b/test/w3c/lua/test553.scxml
index cf926e7..5175945 100644
--- a/test/w3c/lua/test553.scxml
+++ b/test/w3c/lua/test553.scxml
@@ -7,7 +7,7 @@ of <send>'s args causes an error.. -->
<!-- timeout event -->
<send event="timeout" delay="100ms"/>
<!-- generate an invalid namelist -->
- <send event="event1" namelist=""/>
+ <send event="event1" namelist="!no"/>
</onentry>
<!-- if we get the timeout before event1, we assume that event1 hasn't been sent
We ignore the error event here because this assertion doesn't mention it -->
diff --git a/test/w3c/lua/test554.scxml b/test/w3c/lua/test554.scxml
index 5c46992..ed8b3b2 100644
--- a/test/w3c/lua/test554.scxml
+++ b/test/w3c/lua/test554.scxml
@@ -8,7 +8,7 @@ before the timer goes off. -->
<send event="timer" delay="100ms"/>
</onentry>
<!-- reference an invalid namelist -->
- <invoke type="http://www.w3.org/TR/scxml/" namelist="">
+ <invoke type="http://www.w3.org/TR/scxml/" namelist="!no">
<content>
<scxml initial="subFinal" version="1.0" datamodel="lua">
<final id="subFinal"/>
diff --git a/test/w3c/lua/test567.scxml b/test/w3c/lua/test567.scxml
index 0e9b4ca..509cf69 100644
--- a/test/w3c/lua/test567.scxml
+++ b/test/w3c/lua/test567.scxml
@@ -10,7 +10,7 @@ _event.data. -->
<send event="timeout" delay="3s"/>
<!-- in this case, 'test' will be placed in _scxmleventname. The <param> should
be used to populate _event.data -->
- <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="FIXME">
+ <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors.basichttp.location">
<param name="param1" expr="2"/>
</send>
</onentry>