Added new utf8 test for all datamodels

8 files changed, 152 insertions, 1 deletions

diff --git a/test/w3c/c89/test-utf8.scxml b/test/w3c/c89/test-utf8.scxml
new file mode 100644
index 0000000..88632c3
--- /dev/null
+++ b/test/w3c/c89/test-utf8.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- test that neither if clause executes, so that bat is the only event raised. -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="c89">
+  <datamodel>
+    <data id="Var1" expr="&amp;ü&amp;"/>
+    <data id="Var2" expr="&amp;ü&amp;"/>
+  </datamodel>
+  <state id="s0">
+    <transition cond="Var1===Var2" target="pass"/>
+    <transition target="fail"/>
+  </state>
+  <final id="pass">
+    <onentry>
+      <log label="Outcome" expr="&amp;pass&amp;"/>
+    </onentry>
+  </final>
+  <final id="fail">
+    <onentry>
+      <log label="Outcome" expr="&amp;pass&amp;"/>
+    </onentry>
+  </final>
+</scxml>
diff --git a/test/w3c/contrib/test-utf8.txml b/test/w3c/contrib/test-utf8.txml
new file mode 100644
index 0000000..fccabf5
--- /dev/null
+++ b/test/w3c/contrib/test-utf8.txml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- test that neither if clause executes, so that bat is the only event raised. -->
+
+<scxml initial="s0" version="1.0" conf:datamodel=""  xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+<datamodel>
+  <data conf:id="1" conf:quoteExpr="ü"/>
+  <data conf:id="2" conf:quoteExpr="ü"/>
+  </datamodel>
+  
+<state id="s0">
+  <transition conf:VarEqVar="1 2" conf:targetpass=""/>
+  <transition conf:targetfail=""/>
+ </state>
+
+  
+   <conf:pass/>
+   <conf:fail/>
+
+</scxml>
\ No newline at end of file
diff --git a/test/w3c/convert-tests.sh b/test/w3c/convert-tests.sh
index 464c5cb..fcaf978 100755
--- a/test/w3c/convert-tests.sh
+++ b/test/w3c/convert-tests.sh
@@ -47,7 +47,7 @@ while [ "$1" != "" ]; do
 	esac
 done
 
-TXMLS=`ls txml/*.txml`
+TXMLS=`ls txml/*.txml contrib/*.txml`
 TRANSFORM="java -jar /Users/sradomski/Developer/Applications/SaxonHE9-4-0-7J/saxon9he.jar"
 
 # see http://saxon.sourceforge.net/saxon6.5.1/using-xsl.html
diff --git a/test/w3c/ecma/test-utf8.scxml b/test/w3c/ecma/test-utf8.scxml
new file mode 100644
index 0000000..85d3854
--- /dev/null
+++ b/test/w3c/ecma/test-utf8.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- test that neither if clause executes, so that bat is the only event raised. -->
+<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" expr="'ü'"/>
+    <data id="Var2" expr="'ü'"/>
+  </datamodel>
+  <state id="s0">
+    <transition cond="Var1===Var2" target="pass"/>
+    <transition 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>
diff --git a/test/w3c/jexl/test-utf8.scxml b/test/w3c/jexl/test-utf8.scxml
new file mode 100644
index 0000000..932d06f
--- /dev/null
+++ b/test/w3c/jexl/test-utf8.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- test that neither if clause executes, so that bat is the only event raised. -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="jexl">
+  <datamodel>
+    <data id="Var1" expr="'ü'"/>
+    <data id="Var2" expr="'ü'"/>
+  </datamodel>
+  <state id="s0">
+    <transition cond="Var1===Var2" target="pass"/>
+    <transition 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>
diff --git a/test/w3c/lua/test-utf8.scxml b/test/w3c/lua/test-utf8.scxml
new file mode 100644
index 0000000..2ee83a3
--- /dev/null
+++ b/test/w3c/lua/test-utf8.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- test that neither if clause executes, so that bat is the only event raised. -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="lua">
+  <datamodel>
+    <data id="Var1" expr="'ü'"/>
+    <data id="Var2" expr="'ü'"/>
+  </datamodel>
+  <state id="s0">
+    <transition cond="Var1==Var2" target="pass"/>
+    <transition target="fail"/>
+  </state>
+  <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="pass">
+    <onentry>
+      <log label="Outcome" expr="'pass'"/>
+    </onentry>
+  </final>
+  <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="fail">
+    <onentry>
+      <log label="Outcome" expr="'fail'"/>
+    </onentry>
+  </final>
+</scxml>
diff --git a/test/w3c/namespace/test-utf8.scxml b/test/w3c/namespace/test-utf8.scxml
new file mode 100644
index 0000000..ee592ed
--- /dev/null
+++ b/test/w3c/namespace/test-utf8.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- test that neither if clause executes, so that bat is the only event raised. -->
+<scxml:scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" xmlns:scxml="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="ecmascript">
+  <scxml:datamodel>
+    <scxml:data id="Var1" expr="'ü'"/>
+    <scxml:data id="Var2" expr="'ü'"/>
+  </scxml:datamodel>
+  <scxml:state id="s0">
+    <scxml:transition cond="Var1===Var2" target="pass"/>
+    <scxml:transition target="fail"/>
+  </scxml:state>
+  <scxml:final id="pass">
+    <scxml:onentry>
+      <scxml:log label="Outcome" expr="'pass'"/>
+    </scxml:onentry>
+  </scxml:final>
+  <scxml:final id="fail">
+    <scxml:onentry>
+      <scxml:log label="Outcome" expr="'fail'"/>
+    </scxml:onentry>
+  </scxml:final>
+</scxml:scxml>
diff --git a/test/w3c/promela/test-utf8.scxml b/test/w3c/promela/test-utf8.scxml
new file mode 100644
index 0000000..f9ce782
--- /dev/null
+++ b/test/w3c/promela/test-utf8.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- test that neither if clause executes, so that bat is the only event raised. -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="promela">
+  <datamodel>
+    <data id="Var1" type="string" expr="'ü'"/>
+    <data id="Var2" type="string" expr="'ü'"/>
+  </datamodel>
+  <state id="s0">
+    <transition cond="Var1==Var2" target="pass"/>
+    <transition target="fail"/>
+  </state>
+  <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="pass">
+    <onentry>
+      <log label="Outcome" expr="'pass'"/>
+    </onentry>
+  </final>
+  <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="fail">
+    <onentry>
+      <log label="Outcome" expr="'fail'"/>
+    </onentry>
+  </final>
+</scxml>