summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/src/test-lifecycle.cpp114
-rw-r--r--test/w3c/confEcma.xsl17
-rw-r--r--test/w3c/confXPath.xsl17
-rw-r--r--test/w3c/ecma/test252.scxml4
-rw-r--r--test/w3c/ecma/test343.scxml2
-rw-r--r--test/w3c/ecma/test354.scxml4
-rw-r--r--test/w3c/ecma/test487.scxml3
-rw-r--r--test/w3c/ecma/test553.scxml4
-rw-r--r--test/w3c/ecma/test554.scxml4
-rw-r--r--test/w3c/txml/test252.txml4
-rw-r--r--test/w3c/txml/test343.txml2
-rw-r--r--test/w3c/txml/test354.txml4
-rw-r--r--test/w3c/txml/test487.txml3
-rw-r--r--test/w3c/txml/test553.txml4
-rw-r--r--test/w3c/txml/test554.txml4
-rw-r--r--test/w3c/xpath/test252.scxml4
-rw-r--r--test/w3c/xpath/test343.scxml2
-rw-r--r--test/w3c/xpath/test354.scxml4
-rw-r--r--test/w3c/xpath/test487.scxml3
-rw-r--r--test/w3c/xpath/test553.scxml4
-rw-r--r--test/w3c/xpath/test554.scxml4
21 files changed, 122 insertions, 89 deletions
diff --git a/test/src/test-lifecycle.cpp b/test/src/test-lifecycle.cpp
index c0fb55c..7cbb68b 100644
--- a/test/src/test-lifecycle.cpp
+++ b/test/src/test-lifecycle.cpp
@@ -129,7 +129,7 @@ class SequenceCheckingMonitor : public InterpreterMonitor {
virtual void beforeMicroStep(Interpreter interpreter) {
CHECK_CALLBACK_TYPE(USCXML_BEFOREMICROSTEP);
}
-
+
virtual void beforeExitingState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing) {
if (!moreComing)
CHECK_CALLBACK_TYPE(USCXML_BEFOREEXITINGSTATE);
@@ -138,21 +138,21 @@ class SequenceCheckingMonitor : public InterpreterMonitor {
if (!moreComing)
CHECK_CALLBACK_TYPE(USCXML_AFTEREXITINGSTATE);
}
-
+
virtual void beforeExecutingContent(Interpreter interpreter, const Arabica::DOM::Element<std::string>& element) {
CHECK_CALLBACK_TYPE(USCXML_BEFOREEXECUTINGCONTENT);
}
virtual void afterExecutingContent(Interpreter interpreter, const Arabica::DOM::Element<std::string>& element) {
CHECK_CALLBACK_TYPE(USCXML_AFTEREXECUTINGCONTENT);
}
-
+
virtual void beforeUninvoking(Interpreter interpreter, const Arabica::DOM::Element<std::string>& invokeElem, const std::string& invokeid) {
CHECK_CALLBACK_TYPE(USCXML_BEFOREUNINVOKING);
}
virtual void afterUninvoking(Interpreter interpreter, const Arabica::DOM::Element<std::string>& invokeElem, const std::string& invokeid) {
CHECK_CALLBACK_TYPE(USCXML_AFTERUNINVOKING);
}
-
+
virtual void beforeTakingTransition(Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition, bool moreComing) {
if (!moreComing)
CHECK_CALLBACK_TYPE(USCXML_BEFORETAKINGTRANSITION);
@@ -161,7 +161,7 @@ class SequenceCheckingMonitor : public InterpreterMonitor {
if (!moreComing)
CHECK_CALLBACK_TYPE(USCXML_AFTERTAKINGTRANSITION);
}
-
+
virtual void beforeEnteringState(Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing) {
if (!moreComing)
CHECK_CALLBACK_TYPE(USCXML_BEFOREENTERINGSTATE);
@@ -170,22 +170,22 @@ class SequenceCheckingMonitor : public InterpreterMonitor {
if (!moreComing)
CHECK_CALLBACK_TYPE(USCXML_AFTERENTERINGSTATE);
}
-
+
virtual void beforeInvoking(Interpreter interpreter, const Arabica::DOM::Element<std::string>& invokeElem, const std::string& invokeid) {
CHECK_CALLBACK_TYPE(USCXML_BEFOREINVOKING);
}
virtual void afterInvoking(Interpreter interpreter, const Arabica::DOM::Element<std::string>& invokeElem, const std::string& invokeid) {
CHECK_CALLBACK_TYPE(USCXML_AFTERINVOKING);
}
-
+
virtual void afterMicroStep(Interpreter interpreter) {
CHECK_CALLBACK_TYPE(USCXML_AFTERMICROSTEP);
}
-
+
virtual void onStableConfiguration(Interpreter interpreter) {
CHECK_CALLBACK_TYPE(USCXML_ONSTABLECONFIGURATION);
}
-
+
virtual void beforeCompletion(Interpreter interpreter) {
CHECK_CALLBACK_TYPE(USCXML_BEFORECOMPLETION);
}
@@ -208,7 +208,7 @@ int main(int argc, char** argv) {
google::LogToStderr();
SequenceCheckingMonitor* mon = new SequenceCheckingMonitor();
-
+
int iterations = 1;
while(iterations--) {
@@ -241,12 +241,12 @@ int main(int argc, char** argv) {
// request unknown datamodel
try {
const char* xml =
- "<scxml datamodel=\"invalid\">"
- " <state id=\"start\">"
- " <transition target=\"done\" />"
- " </state>"
- " <final id=\"done\" />"
- "</scxml>";
+ "<scxml datamodel=\"invalid\">"
+ " <state id=\"start\">"
+ " <transition target=\"done\" />"
+ " </state>"
+ " <final id=\"done\" />"
+ "</scxml>";
Interpreter interpreter = Interpreter::fromXML(xml);
interpreter.addMonitor(mon);
assert(interpreter.getState() == USCXML_INSTANTIATED);
@@ -260,22 +260,22 @@ int main(int argc, char** argv) {
if (1) {
// two microsteps
const char* xml =
- "<scxml>"
- " <state id=\"start\">"
- " <transition target=\"s2\" />"
- " </state>"
- " <state id=\"s2\">"
- " <transition target=\"done\" />"
- " </state>"
- " <final id=\"done\" />"
- "</scxml>";
-
+ "<scxml>"
+ " <state id=\"start\">"
+ " <transition target=\"s2\" />"
+ " </state>"
+ " <state id=\"s2\">"
+ " <transition target=\"done\" />"
+ " </state>"
+ " <final id=\"done\" />"
+ "</scxml>";
+
Interpreter interpreter = Interpreter::fromXML(xml);
interpreter.addMonitor(mon);
callBackSeq.push_back(USCXML_BEFOREENTERINGSTATE);
callBackSeq.push_back(USCXML_AFTERENTERINGSTATE);
-
+
callBackSeq.push_back(USCXML_BEFOREMICROSTEP);
callBackSeq.push_back(USCXML_BEFOREEXITINGSTATE);
callBackSeq.push_back(USCXML_AFTEREXITINGSTATE);
@@ -295,31 +295,31 @@ int main(int argc, char** argv) {
callBackSeq.push_back(USCXML_AFTERMICROSTEP);
callBackSeq.push_back(USCXML_BEFORECOMPLETION);
- callBackSeq.push_back(USCXML_AFTERCOMPLETION);
-
+ callBackSeq.push_back(USCXML_AFTERCOMPLETION);
+
assert(interpreter.getState() == USCXML_INSTANTIATED);
assert(interpreter.step() == USCXML_MICROSTEPPED);
assert(interpreter.step() == USCXML_MICROSTEPPED);
assert(interpreter.step() == USCXML_FINISHED);
assert(callBackSeq.empty());
}
-
+
if (1) {
// single macrostep, multiple runs
const char* xml =
- "<scxml>"
- " <state id=\"start\">"
- " <transition target=\"done\" />"
- " </state>"
- " <final id=\"done\" />"
- "</scxml>";
-
+ "<scxml>"
+ " <state id=\"start\">"
+ " <transition target=\"done\" />"
+ " </state>"
+ " <final id=\"done\" />"
+ "</scxml>";
+
Interpreter interpreter = Interpreter::fromXML(xml);
interpreter.addMonitor(mon);
callBackSeq.push_back(USCXML_BEFOREENTERINGSTATE);
callBackSeq.push_back(USCXML_AFTERENTERINGSTATE);
-
+
callBackSeq.push_back(USCXML_BEFOREMICROSTEP);
callBackSeq.push_back(USCXML_BEFOREEXITINGSTATE);
callBackSeq.push_back(USCXML_AFTEREXITINGSTATE);
@@ -328,10 +328,10 @@ int main(int argc, char** argv) {
callBackSeq.push_back(USCXML_BEFOREENTERINGSTATE);
callBackSeq.push_back(USCXML_AFTERENTERINGSTATE);
callBackSeq.push_back(USCXML_AFTERMICROSTEP);
-
+
callBackSeq.push_back(USCXML_BEFORECOMPLETION);
callBackSeq.push_back(USCXML_AFTERCOMPLETION);
-
+
assert(interpreter.getState() == USCXML_INSTANTIATED);
assert(interpreter.step() == USCXML_MICROSTEPPED);
assert(interpreter.step() == USCXML_FINISHED);
@@ -339,7 +339,7 @@ int main(int argc, char** argv) {
callBackSeq.push_back(USCXML_BEFOREENTERINGSTATE);
callBackSeq.push_back(USCXML_AFTERENTERINGSTATE);
-
+
callBackSeq.push_back(USCXML_BEFOREMICROSTEP);
callBackSeq.push_back(USCXML_BEFOREEXITINGSTATE);
callBackSeq.push_back(USCXML_AFTEREXITINGSTATE);
@@ -348,7 +348,7 @@ int main(int argc, char** argv) {
callBackSeq.push_back(USCXML_BEFOREENTERINGSTATE);
callBackSeq.push_back(USCXML_AFTERENTERINGSTATE);
callBackSeq.push_back(USCXML_AFTERMICROSTEP);
-
+
callBackSeq.push_back(USCXML_BEFORECOMPLETION);
callBackSeq.push_back(USCXML_AFTERCOMPLETION);
@@ -356,23 +356,23 @@ int main(int argc, char** argv) {
assert(interpreter.step() == USCXML_MICROSTEPPED);
assert(interpreter.step() == USCXML_FINISHED);
}
-
+
if (1) {
// macrostep in between
const char* xml =
- "<scxml>"
- " <state id=\"start\">"
- " <onentry>"
- " <send event=\"continue\" delay=\"2s\"/>"
- " </onentry>"
- " <transition target=\"s2\" event=\"continue\" />"
- " </state>"
- " <state id=\"s2\">"
- " <transition target=\"done\" />"
- " </state>"
- " <final id=\"done\" />"
- "</scxml>";
-
+ "<scxml>"
+ " <state id=\"start\">"
+ " <onentry>"
+ " <send event=\"continue\" delay=\"2s\"/>"
+ " </onentry>"
+ " <transition target=\"s2\" event=\"continue\" />"
+ " </state>"
+ " <state id=\"s2\">"
+ " <transition target=\"done\" />"
+ " </state>"
+ " <final id=\"done\" />"
+ "</scxml>";
+
Interpreter interpreter = Interpreter::fromXML(xml);
interpreter.addMonitor(mon);
@@ -410,7 +410,7 @@ int main(int argc, char** argv) {
assert(interpreter.step() == USCXML_MICROSTEPPED);
assert(interpreter.step() == USCXML_FINISHED);
}
-
+
#if 0
diff --git a/test/w3c/confEcma.xsl b/test/w3c/confEcma.xsl
index ffc922d..a77d552 100644
--- a/test/w3c/confEcma.xsl
+++ b/test/w3c/confEcma.xsl
@@ -165,7 +165,7 @@
<content xmlns="http://www.w3.org/2005/07/scxml">foo</content>
</xsl:template>
-
+<xsl:template match="//conf:someInlineVal">123</xsl:template>
<!-- this returns something that is guaranteed not to be the ID of the current session -->
<xsl:template match="//@conf:invalidSessionID">
@@ -273,6 +273,12 @@ events which cause the test to fail. The default value provided here is pretty
<xsl:attribute name="namelist">Var<xsl:value-of select="." /></xsl:attribute>
</xsl:template>
+<!-- this produces a reference to an invalid namelist, i.e. on that should cause an error -->
+<xsl:template match="//@conf:invalidNamelist">
+ <xsl:attribute name="namelist">"foo"</xsl:attribute>
+</xsl:template>
+
+
<!-- transition conditions -->
@@ -380,6 +386,10 @@ events which cause the test to fail. The default value provided here is pretty
</xsl:attribute>
</xsl:template>
+<!-- test that the specified var has the value specified by <conf:someInlineVal> -->
+<xsl:template match="//@conf:idSomeVal">
+ <xsl:attribute name="cond">Var<xsl:value-of select="." /> == 123</xsl:attribute>
+</xsl:template>
<!-- test that the event's name fieldhas the value specified -->
<xsl:template match="//@conf:eventNameVal">
@@ -428,6 +438,11 @@ is the second argument -->
<xsl:attribute name="cond">_event.data == <xsl:value-of select="."/></xsl:attribute>
</xsl:template>
+<!-- test that _event.data is set to the value specified by <conf:someInlineVal> -->
+<xsl:template match="//@conf:eventdataSomeVal">
+ <xsl:attribute name="cond">_event.data == 123</xsl:attribute>
+</xsl:template>
+
<xsl:template match="//@conf:emptyEventData">
<xsl:attribute name="cond">typeof _event.data === 'undefined'</xsl:attribute>
</xsl:template>
diff --git a/test/w3c/confXPath.xsl b/test/w3c/confXPath.xsl
index 71286ce..bb65375 100644
--- a/test/w3c/confXPath.xsl
+++ b/test/w3c/confXPath.xsl
@@ -204,7 +204,7 @@ is of the same type as array123 -->
<content xmlns="http://www.w3.org/2005/07/scxml">foo</content>
</xsl:template>
-
+<xsl:template match="//conf:someInlineVal">123</xsl:template>
<!-- this returns something that is guaranteed not to be the ID of the current session -->
@@ -270,6 +270,11 @@ events which cause the test to fail. The default value provided here is pretty
<xsl:attribute name="namelist">$Var<xsl:value-of select="." /></xsl:attribute>
</xsl:template>
+<!-- this produces a reference to an invalid namelist, i.e. on that should cause an error -->
+<xsl:template match="//@conf:invalidNamelist">
+ <xsl:attribute name="namelist">"foo"</xsl:attribute>
+</xsl:template>
+
<!-- exprs that return the value of the event fields -->
<xsl:template match="//@conf:eventName">
@@ -419,6 +424,11 @@ know if we can make this strong in XPath 1.0 -->
</xsl:attribute>
</xsl:template>
+<!-- test that the specified var has the value specified by <conf:someInlineVal> -->
+<xsl:template match="//@conf:idSomeVal">
+ <xsl:attribute name="cond">Var<xsl:value-of select="." /> = 123</xsl:attribute>
+</xsl:template>
+
<!-- test on the value of two vars -->
<xsl:template match="//@conf:compareIDVal">
<xsl:attribute name="cond">
@@ -513,6 +523,11 @@ is the second argument -->
<xsl:attribute name="cond">$_event/data = <xsl:value-of select="."/></xsl:attribute>
</xsl:template>
+<!-- test that _event.data is set to the value specified by <conf:someInlineVal> -->
+<xsl:template match="//@conf:eventdataSomeVal">
+ <xsl:attribute name="cond">_event.data = 123</xsl:attribute>
+</xsl:template>
+
<xsl:template match="//@conf:emptyEventData">
<xsl:attribute name="cond">not($_event/data/*)</xsl:attribute>
</xsl:template>
diff --git a/test/w3c/ecma/test252.scxml b/test/w3c/ecma/test252.scxml
index 14c6686..b33342b 100644
--- a/test/w3c/ecma/test252.scxml
+++ b/test/w3c/ecma/test252.scxml
@@ -5,7 +5,7 @@ timeout indicates success. --><scxml xmlns="http://www.w3.org/2005/07/scxml" x
<state id="s0" initial="s01">
<onentry>
- <send event="timeout" delay="2s"/>
+ <send event="timeout" delayexpr="'50ms'"/>
</onentry>
<transition event="timeout" target="pass"/>
@@ -22,7 +22,7 @@ timeout indicates success. --><scxml xmlns="http://www.w3.org/2005/07/scxml" x
<scxml initial="sub0" version="1.0" datamodel="ecmascript">
<state id="sub0">
<onentry>
- <send event="timeout" delay="2s"/>
+ <send event="timeout" delayexpr="'25ms'"/>
</onentry>
<transition event="timeout" target="subFinal"/>
<onexit>
diff --git a/test/w3c/ecma/test343.scxml b/test/w3c/ecma/test343.scxml
index 7f15cf0..a1455d9 100644
--- a/test/w3c/ecma/test343.scxml
+++ b/test/w3c/ecma/test343.scxml
@@ -14,7 +14,7 @@
</state>
<final id="s02">
<donedata>
- <param location="Varfoo" name="someParam"/>
+ <param location="foo.bar.baz " name="someParam"/>
</donedata>
</final>
</state>
diff --git a/test/w3c/ecma/test354.scxml b/test/w3c/ecma/test354.scxml
index ef55794..6c544a4 100644
--- a/test/w3c/ecma/test354.scxml
+++ b/test/w3c/ecma/test354.scxml
@@ -37,10 +37,10 @@ and that correct values are used --><scxml xmlns="http://www.w3.org/2005/07/scxm
<onentry>
<send delay="5s" event="timeout"/>
<send event="event2">
- <content>foo</content>
+ <content>123</content>
</send>
</onentry>
- <transition event="event2" cond="_event.data == 'foo'" target="pass"/>
+ <transition event="event2" cond="_event.data == 123" target="pass"/>
<transition event="*" target="fail"/>
</state>
diff --git a/test/w3c/ecma/test487.scxml b/test/w3c/ecma/test487.scxml
index 30a50eb..5baacbe 100644
--- a/test/w3c/ecma/test487.scxml
+++ b/test/w3c/ecma/test487.scxml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><!-- test illegal assignment. error.execution should be raised. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
<datamodel>
- <data id="Var1" expr="return"/>
+ <data id="Var1"/>
</datamodel>
<state id="s0">
<onentry>
+ <assign location="Var1" expr="return"/>
<raise event="event"/>
</onentry>
diff --git a/test/w3c/ecma/test553.scxml b/test/w3c/ecma/test553.scxml
index 0beddea..0df3c3e 100644
--- a/test/w3c/ecma/test553.scxml
+++ b/test/w3c/ecma/test553.scxml
@@ -6,8 +6,8 @@ of <send>'s args causes an error.. --><scxml xmlns="http://www.w3.org/2005/07/s
<onentry>
<!-- timeout event -->
<send event="timeout" delayexpr="'50ms'"/>
- <!-- include a non-existing var in the namelist -->
- <send event="event1" namelist="Var2"/>
+ <!-- generate an invalid namelist -->
+ <send event="event1" namelist="&#34;foo&#34;"/>
</onentry>
<!-- if we get the timeout before event1, we assume that event1 hasn't been sent
diff --git a/test/w3c/ecma/test554.scxml b/test/w3c/ecma/test554.scxml
index 960f5ac..764241e 100644
--- a/test/w3c/ecma/test554.scxml
+++ b/test/w3c/ecma/test554.scxml
@@ -8,8 +8,8 @@ before the timer goes off. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xm
<send event="timer" delayexpr="'50ms'"/>
</onentry>
- <!-- namelist references an undeclared variable -->
- <invoke type="http://www.w3.org/TR/scxml/" namelist="Var2">
+ <!-- reference an invalid namelist -->
+ <invoke type="http://www.w3.org/TR/scxml/" namelist="&#34;foo&#34;">
<content>
<scxml initial="subFinal" version="1.0" datamodel="ecmascript">
<final id="subFinal"/>
diff --git a/test/w3c/txml/test252.txml b/test/w3c/txml/test252.txml
index 40c36cb..ba43543 100644
--- a/test/w3c/txml/test252.txml
+++ b/test/w3c/txml/test252.txml
@@ -9,7 +9,7 @@ timeout indicates success. -->
<state id="s0" initial="s01">
<onentry>
- <send event="timeout" delay="2s"/>
+ <send event="timeout" conf:delay="1"/>
</onentry>
<transition event="timeout" conf:targetpass=""/>
@@ -26,7 +26,7 @@ timeout indicates success. -->
<scxml initial="sub0" version="1.0" conf:datamodel="" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
<state id="sub0">
<onentry>
- <send event="timeout" delay="2s"/>
+ <send event="timeout" conf:delay=".5"/>
</onentry>
<transition event="timeout" target="subFinal"/>
<onexit>
diff --git a/test/w3c/txml/test343.txml b/test/w3c/txml/test343.txml
index 1d13da6..f0aba04 100644
--- a/test/w3c/txml/test343.txml
+++ b/test/w3c/txml/test343.txml
@@ -17,7 +17,7 @@
</state>
<final id="s02">
<donedata>
- <param conf:location="foo" name="someParam"/>
+ <param conf:invalidLocation="foo" name="someParam"/>
</donedata>
</final>
</state>
diff --git a/test/w3c/txml/test354.txml b/test/w3c/txml/test354.txml
index 0f1f6c5..890b6ef 100644
--- a/test/w3c/txml/test354.txml
+++ b/test/w3c/txml/test354.txml
@@ -41,10 +41,10 @@ and that correct values are used -->
<onentry>
<send delay="5s" event="timeout"/>
<send event="event2">
- <content>foo</content>
+ <content><conf:someInlineVal/></content>
</send>
</onentry>
- <transition event="event2" conf:eventdataVal="'foo'" conf:targetpass=""/>
+ <transition event="event2" conf:eventdataSomeVal="" conf:targetpass=""/>
<transition event="*" conf:targetfail=""/>
</state>
diff --git a/test/w3c/txml/test487.txml b/test/w3c/txml/test487.txml
index 7210c2b..fe7423c 100644
--- a/test/w3c/txml/test487.txml
+++ b/test/w3c/txml/test487.txml
@@ -4,11 +4,12 @@
<scxml initial="s0" conf:datamodel="" version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
<datamodel>
- <data conf:id="1" conf:illegalExpr=""/>
+ <data conf:id="1"/>
</datamodel>
<state id="s0">
<onentry>
+ <assign conf:location="1" conf:illegalExpr=""/>
<raise event="event"/>
</onentry>
diff --git a/test/w3c/txml/test553.txml b/test/w3c/txml/test553.txml
index 0c6a622..b9dfece 100644
--- a/test/w3c/txml/test553.txml
+++ b/test/w3c/txml/test553.txml
@@ -10,8 +10,8 @@ of <send>'s args causes an error.. -->
<onentry>
<!-- timeout event -->
<send event="timeout" conf:delay="1"/>
- <!-- include a non-existing var in the namelist -->
- <send event="event1" conf:namelist="2"/>
+ <!-- generate an invalid namelist -->
+ <send event="event1" conf:invalidNamelist=""/>
</onentry>
<!-- if we get the timeout before event1, we assume that event1 hasn't been sent
diff --git a/test/w3c/txml/test554.txml b/test/w3c/txml/test554.txml
index 663424f..9e16cf8 100644
--- a/test/w3c/txml/test554.txml
+++ b/test/w3c/txml/test554.txml
@@ -12,8 +12,8 @@ before the timer goes off. -->
<send event="timer" conf:delay="1"/>
</onentry>
- <!-- namelist references an undeclared variable -->
- <invoke type="http://www.w3.org/TR/scxml/" conf:namelist="2">
+ <!-- reference an invalid namelist -->
+ <invoke type="http://www.w3.org/TR/scxml/" conf:invalidNamelist="">
<content>
<scxml initial="subFinal" version="1.0" conf:datamodel="" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
<final id="subFinal"/>
diff --git a/test/w3c/xpath/test252.scxml b/test/w3c/xpath/test252.scxml
index 1f92127..f8d93a5 100644
--- a/test/w3c/xpath/test252.scxml
+++ b/test/w3c/xpath/test252.scxml
@@ -5,7 +5,7 @@ timeout indicates success. --><scxml xmlns="http://www.w3.org/2005/07/scxml" x
<state id="s0" initial="s01">
<onentry>
- <send event="timeout" delay="2s"/>
+ <send event="timeout" delayexpr="'1s'"/>
</onentry>
<transition event="timeout" target="pass"/>
@@ -22,7 +22,7 @@ timeout indicates success. --><scxml xmlns="http://www.w3.org/2005/07/scxml" x
<scxml initial="sub0" version="1.0" datamodel="xpath">
<state id="sub0">
<onentry>
- <send event="timeout" delay="2s"/>
+ <send event="timeout" delayexpr="'.5s'"/>
</onentry>
<transition event="timeout" target="subFinal"/>
<onexit>
diff --git a/test/w3c/xpath/test343.scxml b/test/w3c/xpath/test343.scxml
index bae14de..e3dbf53 100644
--- a/test/w3c/xpath/test343.scxml
+++ b/test/w3c/xpath/test343.scxml
@@ -14,7 +14,7 @@
</state>
<final id="s02">
<donedata>
- <param location="$Varfoo" name="someParam"/>
+ <param location="foo.bar.baz " name="someParam"/>
</donedata>
</final>
</state>
diff --git a/test/w3c/xpath/test354.scxml b/test/w3c/xpath/test354.scxml
index 499b568..e75d382 100644
--- a/test/w3c/xpath/test354.scxml
+++ b/test/w3c/xpath/test354.scxml
@@ -37,10 +37,10 @@ and that correct values are used --><scxml xmlns="http://www.w3.org/2005/07/scxm
<onentry>
<send delay="5s" event="timeout"/>
<send event="event2">
- <content>foo</content>
+ <content>123</content>
</send>
</onentry>
- <transition event="event2" cond="$_event/data = 'foo'" target="pass"/>
+ <transition event="event2" cond="_event.data = 123" target="pass"/>
<transition event="*" target="fail"/>
</state>
diff --git a/test/w3c/xpath/test487.scxml b/test/w3c/xpath/test487.scxml
index 9e6c441..cec2f64 100644
--- a/test/w3c/xpath/test487.scxml
+++ b/test/w3c/xpath/test487.scxml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><!-- test illegal assignment. error.execution should be raised. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
<datamodel>
- <data id="Var1" expr="!1"/>
+ <data id="Var1"/>
</datamodel>
<state id="s0">
<onentry>
+ <assign location="$Var1" expr="!1"/>
<raise event="event"/>
</onentry>
diff --git a/test/w3c/xpath/test553.scxml b/test/w3c/xpath/test553.scxml
index 00bd1e8..90cd97c 100644
--- a/test/w3c/xpath/test553.scxml
+++ b/test/w3c/xpath/test553.scxml
@@ -6,8 +6,8 @@ of <send>'s args causes an error.. --><scxml xmlns="http://www.w3.org/2005/07/s
<onentry>
<!-- timeout event -->
<send event="timeout" delayexpr="'1s'"/>
- <!-- include a non-existing var in the namelist -->
- <send event="event1" namelist="$Var2"/>
+ <!-- generate an invalid namelist -->
+ <send event="event1" namelist="&#34;foo&#34;"/>
</onentry>
<!-- if we get the timeout before event1, we assume that event1 hasn't been sent
diff --git a/test/w3c/xpath/test554.scxml b/test/w3c/xpath/test554.scxml
index 1a2b58a..74e25b3 100644
--- a/test/w3c/xpath/test554.scxml
+++ b/test/w3c/xpath/test554.scxml
@@ -8,8 +8,8 @@ before the timer goes off. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xm
<send event="timer" delayexpr="'1s'"/>
</onentry>
- <!-- namelist references an undeclared variable -->
- <invoke type="http://www.w3.org/TR/scxml/" namelist="$Var2">
+ <!-- reference an invalid namelist -->
+ <invoke type="http://www.w3.org/TR/scxml/" namelist="&#34;foo&#34;">
<content>
<scxml initial="subFinal" version="1.0" datamodel="xpath">
<final id="subFinal"/>
generated by cgit v0.12 at 2024-07-19 18:04:17 (GMT)