7 files changed, 133 insertions, 1 deletions
diff --git a/test/ctest/CTestCustom.ctest.in b/test/ctest/CTestCustom.ctest.in
index 6d4fa56..d6a5884 100644
--- a/test/ctest/CTestCustom.ctest.in
+++ b/test/ctest/CTestCustom.ctest.in
@@ -34,6 +34,8 @@ set(CTEST_CUSTOM_TESTS_IGNORE
 	"w3c/ecma/test301.scxml" # Invalid script URL - PASSED
 	"w3c/ecma/test436.scxml" # Tests NULL datamodel - PASSED
 
+  "w3c/namespace/test301.scxml" # Invalid script URL - PASSED
+
 
   ### Just ignore the XPath datamodel tests that hang, most of the rest fails as well
 	"w3c/xpath/test178.scxml" # Manual - PASSED
diff --git a/test/w3c/c89/test-enc-CP1252.scxml b/test/w3c/c89/test-enc-CP1252.scxml
new file mode 100644
index 0000000..79372ba
--- /dev/null
+++ b/test/w3c/c89/test-enc-CP1252.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="CP1252"?>
+<!-- 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="s1"/>
+    <transition target="fail"/>
+  </state>
+  <state id="s1">
+    <transition cond="Var1=='ü'" 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/convert-tests.sh b/test/w3c/convert-tests.sh
index 8ffe48b..0adf253 100755
--- a/test/w3c/convert-tests.sh
+++ b/test/w3c/convert-tests.sh
@@ -135,7 +135,7 @@ find ./jexl -type f -exec grep -Ili 'datamodel="ecmascript"' {} \; |xargs rm -fv
 find ./jexl -type f -exec grep -Ili 'datamodel="null"' {} \; |xargs rm -fv
 
 # create other encoding tests from the utf8 one
-for ENC in ISO-8859-15 CP1250;
+for ENC in ISO-8859-15 CP1250 CP1252;
 do
 	export ENC=$ENC
 	find . -name "test-enc-UTF8.scxml" -exec sh -c 'sed "s/UTF-8/${ENC}/g" {} > $(dirname {})/test-enc-${ENC}.tmp.scxml' \;
diff --git a/test/w3c/ecma/test-enc-CP1252.scxml b/test/w3c/ecma/test-enc-CP1252.scxml
new file mode 100644
index 0000000..be03547
--- /dev/null
+++ b/test/w3c/ecma/test-enc-CP1252.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="CP1252"?>
+<!-- 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="s1"/>
+    <transition target="fail"/>
+  </state>
+  <state id="s1">
+    <transition cond="Var1=='ü'" 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-enc-CP1252.scxml b/test/w3c/jexl/test-enc-CP1252.scxml
new file mode 100644
index 0000000..1725fa5
--- /dev/null
+++ b/test/w3c/jexl/test-enc-CP1252.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="CP1252"?>
+<!-- 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="s1"/>
+    <transition target="fail"/>
+  </state>
+  <state id="s1">
+    <transition cond="Var1=='ü'" 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-enc-CP1252.scxml b/test/w3c/lua/test-enc-CP1252.scxml
new file mode 100644
index 0000000..5946a72
--- /dev/null
+++ b/test/w3c/lua/test-enc-CP1252.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="CP1252"?>
+<!-- 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="s1"/>
+    <transition target="fail"/>
+  </state>
+  <state id="s1">
+    <transition cond="Var1=='ü'" 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-enc-CP1252.scxml b/test/w3c/namespace/test-enc-CP1252.scxml
new file mode 100644
index 0000000..d5dd18b
--- /dev/null
+++ b/test/w3c/namespace/test-enc-CP1252.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="CP1252"?>
+<!-- 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="s1"/>
+    <scxml:transition target="fail"/>
+  </scxml:state>
+  <scxml:state id="s1">
+    <scxml:transition cond="Var1=='ü'" 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>