Proper XML encoding names

12 files changed, 6 insertions, 162 deletions

diff --git a/test/w3c/c89/test-enc-CP1252.scxml b/test/w3c/c89/test-enc-CP1252.scxml
deleted file mode 100644
index 79372ba..0000000
--- a/test/w3c/c89/test-enc-CP1252.scxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/c89/test-enc-CP1250.scxml b/test/w3c/c89/test-enc-WINDOWS-1252.scxml
index 3cd1241..450fd4d 100644
--- a/test/w3c/c89/test-enc-CP1250.scxml
+++ b/test/w3c/c89/test-enc-WINDOWS-1252.scxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="CP1250"?>
+<?xml version="1.0" encoding="WINDOWS-1252"?>
 <!-- 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>
diff --git a/test/w3c/convert-tests.sh b/test/w3c/convert-tests.sh
index 0adf253..cb138a2 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 CP1252;
+for ENC in ISO-8859-15 WINDOWS-1252;
 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-ASCII.scxml b/test/w3c/ecma/test-enc-ASCII.scxml
deleted file mode 100644
index be03547..0000000
--- a/test/w3c/ecma/test-enc-ASCII.scxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/ecma/test-enc-CP1250.scxml b/test/w3c/ecma/test-enc-CP1250.scxml
deleted file mode 100644
index 83b8218..0000000
--- a/test/w3c/ecma/test-enc-CP1250.scxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="CP1250"?>
-<!-- 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/ecma/test-enc-CP1252.scxml b/test/w3c/ecma/test-enc-WINDOWS-1252.scxml
index be03547..d21d265 100644
--- a/test/w3c/ecma/test-enc-CP1252.scxml
+++ b/test/w3c/ecma/test-enc-WINDOWS-1252.scxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="CP1252"?>
+<?xml version="1.0" encoding="WINDOWS-1252"?>
 <!-- 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>
diff --git a/test/w3c/jexl/test-enc-CP1250.scxml b/test/w3c/jexl/test-enc-CP1250.scxml
deleted file mode 100644
index 993f0dc..0000000
--- a/test/w3c/jexl/test-enc-CP1250.scxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="CP1250"?>
-<!-- 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/jexl/test-enc-CP1252.scxml b/test/w3c/jexl/test-enc-WINDOWS-1252.scxml
index 1725fa5..ab2a45e 100644
--- a/test/w3c/jexl/test-enc-CP1252.scxml
+++ b/test/w3c/jexl/test-enc-WINDOWS-1252.scxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="CP1252"?>
+<?xml version="1.0" encoding="WINDOWS-1252"?>
 <!-- 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>
diff --git a/test/w3c/lua/test-enc-CP1252.scxml b/test/w3c/lua/test-enc-CP1252.scxml
deleted file mode 100644
index 5946a72..0000000
--- a/test/w3c/lua/test-enc-CP1252.scxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/lua/test-enc-CP1250.scxml b/test/w3c/lua/test-enc-WINDOWS-1252.scxml
index 47272f5..9f93f72 100644
--- a/test/w3c/lua/test-enc-CP1250.scxml
+++ b/test/w3c/lua/test-enc-WINDOWS-1252.scxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="CP1250"?>
+<?xml version="1.0" encoding="WINDOWS-1252"?>
 <!-- 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>
diff --git a/test/w3c/namespace/test-enc-CP1252.scxml b/test/w3c/namespace/test-enc-CP1252.scxml
deleted file mode 100644
index d5dd18b..0000000
--- a/test/w3c/namespace/test-enc-CP1252.scxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>
diff --git a/test/w3c/namespace/test-enc-CP1250.scxml b/test/w3c/namespace/test-enc-WINDOWS-1252.scxml
index bfa62de..b0509c1 100644
--- a/test/w3c/namespace/test-enc-CP1250.scxml
+++ b/test/w3c/namespace/test-enc-WINDOWS-1252.scxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="CP1250"?>
+<?xml version="1.0" encoding="WINDOWS-1252"?>
 <!-- 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>