summaryrefslogtreecommitdiffstats
path: root/test/w3c
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-06-25 21:05:44 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-06-25 21:05:44 (GMT)
commite3767be4f9c5874d9c996200f2e9705ce31a5976 (patch)
treebe3d06f550286e23eeb3252277c1a2b7d12554ef /test/w3c
parent758bda908ded461c9d34d274a18454ffba4b7450 (diff)
downloaduscxml-e3767be4f9c5874d9c996200f2e9705ce31a5976.zip
uscxml-e3767be4f9c5874d9c996200f2e9705ce31a5976.tar.gz
uscxml-e3767be4f9c5874d9c996200f2e9705ce31a5976.tar.bz2
Work on bindings
- Introduced exceptions into C# and Java - Moved binding examples to /embedding - Interpreter will now throw exceptions, beware!
Diffstat (limited to 'test/w3c')
-rw-r--r--test/w3c/confEcma.xsl2
-rw-r--r--test/w3c/ecma/test329.scxml1
-rw-r--r--test/w3c/ecma/test350.scxml24
-rw-r--r--test/w3c/ecma/test446.scxml2
-rw-r--r--test/w3c/ecma/test446.txt12
-rw-r--r--test/w3c/ecma/test458.txt1
-rw-r--r--test/w3c/ecma/test519.scxml2
-rw-r--r--test/w3c/ecma/test534.scxml2
-rw-r--r--test/w3c/txml/test350.txml6
-rw-r--r--test/w3c/txml/test446.txml2
-rw-r--r--test/w3c/txml/test446.txt12
-rw-r--r--test/w3c/xpath/test350.scxml24
-rw-r--r--test/w3c/xpath/test446.scxml2
-rw-r--r--test/w3c/xpath/test446.txt12
14 files changed, 93 insertions, 11 deletions
diff --git a/test/w3c/confEcma.xsl b/test/w3c/confEcma.xsl
index 96c1708..b77e22c 100644
--- a/test/w3c/confEcma.xsl
+++ b/test/w3c/confEcma.xsl
@@ -674,7 +674,7 @@ the basic http tests. In the case of python, we have to import the regexp modul
<!-- returns true if _event/raw contains the param with the specified value -->
<xsl:template match="//@conf:eventNamedParamHasValue">
<xsl:attribute name="cond"><xsl:analyze-string select="." regex="(\S+)(\s+)(\S+)">
- <xsl:matching-substring>_event.raw.search(/Var<xsl:value-of select="regex-group(1)"/>=<xsl:value-of select="regex-group(3)"/>/) !== -1</xsl:matching-substring></xsl:analyze-string></xsl:attribute>
+ <xsl:matching-substring>_event.raw.search(<xsl:value-of select="regex-group(1)"/>=<xsl:value-of select="regex-group(3)"/>) !== -1</xsl:matching-substring></xsl:analyze-string></xsl:attribute>
</xsl:template>
<xsl:template match="//@conf:messageBodyEquals">
diff --git a/test/w3c/ecma/test329.scxml b/test/w3c/ecma/test329.scxml
index 586f15a..9a95643 100644
--- a/test/w3c/ecma/test329.scxml
+++ b/test/w3c/ecma/test329.scxml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?><!-- test that none of the system variables can be modified --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript" name="machineName">
- <script src="http://uscxml.tk.informatik.tu-darmstadt.de/scripts/dump.js" />
<datamodel>
<data id="Var1"/>
<data id="Var2"/>
diff --git a/test/w3c/ecma/test350.scxml b/test/w3c/ecma/test350.scxml
new file mode 100644
index 0000000..176903e
--- /dev/null
+++ b/test/w3c/ecma/test350.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that target value is used to decide what session to deliver the event to. A session should be
+able to send an event to itself using its own session ID as the target --><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="'#_scxml_'"/>
+ <data id="Var2" expr="_sessionid"/>
+</datamodel>
+
+<state id="s0">
+
+ <onentry>
+ <assign location="Var1" expr="Var1 + Var2"/>
+ <send delay="5s" event="timeout"/>
+ <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" targetexpr="Var1" event="s0Event"/>
+ </onentry>
+ <transition event="s0Event" target="pass"/>
+ <transition event="*" target="fail"/>
+
+</state>
+
+
+ <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+ <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml> \ No newline at end of file
diff --git a/test/w3c/ecma/test446.scxml b/test/w3c/ecma/test446.scxml
index 0fa8698..64ab3c9 100644
--- a/test/w3c/ecma/test446.scxml
+++ b/test/w3c/ecma/test446.scxml
@@ -2,7 +2,7 @@
assigns it as the value of the var --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
<datamodel>
<data id="var1">[1, 2, 3]</data>
- <data id="var2" src="file:test458.txt"/>
+ <data id="var2" src="file:test446.txt"/>
</datamodel>
<state id="s0">
diff --git a/test/w3c/ecma/test446.txt b/test/w3c/ecma/test446.txt
new file mode 100644
index 0000000..4db4843
--- /dev/null
+++ b/test/w3c/ecma/test446.txt
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+<html><head>
+<title>300 Multiple Choices</title>
+</head><body>
+<h1>Multiple Choices</h1>
+The document name you requested (<code>/Voice/2013/scxml-irp/446/test446.txt</code>) could not be found on this server.
+However, we found documents with names similar to the one you requested.<p>Available documents:
+<ul>
+<li><a href="/Voice/2013/scxml-irp/446/test446.txml">/Voice/2013/scxml-irp/446/test446.txml</a> (common basename)
+</ul>
+Please consider informing the owner of the <a href="http://www.w3.org/Voice/2013/scxml-irp/">referring page</a> about the broken link.
+</body></html>
diff --git a/test/w3c/ecma/test458.txt b/test/w3c/ecma/test458.txt
deleted file mode 100644
index 6001c44..0000000
--- a/test/w3c/ecma/test458.txt
+++ /dev/null
@@ -1 +0,0 @@
-[1, 2, 3] \ No newline at end of file
diff --git a/test/w3c/ecma/test519.scxml b/test/w3c/ecma/test519.scxml
index 6f559da..8945354 100644
--- a/test/w3c/ecma/test519.scxml
+++ b/test/w3c/ecma/test519.scxml
@@ -10,7 +10,7 @@
</onentry>
<!-- if other end sends us back this event, we succeed -->
- <transition event="test" cond="_event.raw.search(/Varparam1=1/) !== -1" target="pass"/>
+ <transition event="test" cond="_event.raw.search(param1=1) !== -1" target="pass"/>
<transition event="*" target="fail"/>
</state>
diff --git a/test/w3c/ecma/test534.scxml b/test/w3c/ecma/test534.scxml
index 9495d9e..57a54bf 100644
--- a/test/w3c/ecma/test534.scxml
+++ b/test/w3c/ecma/test534.scxml
@@ -9,7 +9,7 @@
</onentry>
<!-- if other end sends us back this event, we succeed -->
- <transition event="test" cond="_event.raw.search(/Var_scxmleventname=test/) !== -1" target="pass"/>
+ <transition event="test" cond="_event.raw.search('_scxmleventname=test') !== -1" target="pass"/>
<transition event="*" target="fail"/>
</state>
diff --git a/test/w3c/txml/test350.txml b/test/w3c/txml/test350.txml
index 1086db7..784b96e 100644
--- a/test/w3c/txml/test350.txml
+++ b/test/w3c/txml/test350.txml
@@ -6,15 +6,15 @@ able to send an event to itself using its own session ID as the target -->
<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:quoteExpr="#_scxml_"/>
- <data conf:id="2" conf:systemVarExpr="_sessionid”/>
+ <data conf:id="2" conf:systemVarExpr="_sessionid"/>
</datamodel>
<state id="s0">
<onentry>
- <conf:concatVars id1="1" id2="2"/>
+ <conf:concatVars id1="1" id2="2"/>
<send delay="5s" event="timeout"/>
- <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" conf:targetVar="1" event="s0Event"/>
+ <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" conf:targetVar="1" event="s0Event"/>
</onentry>
<transition event="s0Event" conf:targetpass=""/>
<transition event="*" conf:targetfail=""/>
diff --git a/test/w3c/txml/test446.txml b/test/w3c/txml/test446.txml
index afdf6a0..3d03fcf 100644
--- a/test/w3c/txml/test446.txml
+++ b/test/w3c/txml/test446.txml
@@ -6,7 +6,7 @@
xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
<datamodel>
<data id="var1">[1, 2, 3]</data>
- <data id="var2" src="file:test458.txt"/>
+ <data id="var2" src="file:test446.txt"/>
</datamodel>
<state id="s0">
diff --git a/test/w3c/txml/test446.txt b/test/w3c/txml/test446.txt
new file mode 100644
index 0000000..4db4843
--- /dev/null
+++ b/test/w3c/txml/test446.txt
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+<html><head>
+<title>300 Multiple Choices</title>
+</head><body>
+<h1>Multiple Choices</h1>
+The document name you requested (<code>/Voice/2013/scxml-irp/446/test446.txt</code>) could not be found on this server.
+However, we found documents with names similar to the one you requested.<p>Available documents:
+<ul>
+<li><a href="/Voice/2013/scxml-irp/446/test446.txml">/Voice/2013/scxml-irp/446/test446.txml</a> (common basename)
+</ul>
+Please consider informing the owner of the <a href="http://www.w3.org/Voice/2013/scxml-irp/">referring page</a> about the broken link.
+</body></html>
diff --git a/test/w3c/xpath/test350.scxml b/test/w3c/xpath/test350.scxml
new file mode 100644
index 0000000..848ed71
--- /dev/null
+++ b/test/w3c/xpath/test350.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that target value is used to decide what session to deliver the event to. A session should be
+able to send an event to itself using its own session ID as the target --><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="'#_scxml_'"/>
+ <data id="Var2" expr="$_sessionid"/>
+</datamodel>
+
+<state id="s0">
+
+ <onentry>
+ <assign location="$Var1" expr="concat($Var1, $Var2)"/>
+ <send delay="5s" event="timeout"/>
+ <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" targetexpr="$Var1" event="s0Event"/>
+ </onentry>
+ <transition event="s0Event" target="pass"/>
+ <transition event="*" target="fail"/>
+
+</state>
+
+
+ <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+ <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml> \ No newline at end of file
diff --git a/test/w3c/xpath/test446.scxml b/test/w3c/xpath/test446.scxml
index 0fa8698..64ab3c9 100644
--- a/test/w3c/xpath/test446.scxml
+++ b/test/w3c/xpath/test446.scxml
@@ -2,7 +2,7 @@
assigns it as the value of the var --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
<datamodel>
<data id="var1">[1, 2, 3]</data>
- <data id="var2" src="file:test458.txt"/>
+ <data id="var2" src="file:test446.txt"/>
</datamodel>
<state id="s0">
diff --git a/test/w3c/xpath/test446.txt b/test/w3c/xpath/test446.txt
new file mode 100644
index 0000000..4db4843
--- /dev/null
+++ b/test/w3c/xpath/test446.txt
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+<html><head>
+<title>300 Multiple Choices</title>
+</head><body>
+<h1>Multiple Choices</h1>
+The document name you requested (<code>/Voice/2013/scxml-irp/446/test446.txt</code>) could not be found on this server.
+However, we found documents with names similar to the one you requested.<p>Available documents:
+<ul>
+<li><a href="/Voice/2013/scxml-irp/446/test446.txml">/Voice/2013/scxml-irp/446/test446.txml</a> (common basename)
+</ul>
+Please consider informing the owner of the <a href="http://www.w3.org/Voice/2013/scxml-irp/">referring page</a> about the broken link.
+</body></html>