More work on lua datamodel

37 files changed, 14 insertions, 715 deletions

diff --git a/test/w3c/lua/test176.scxml b/test/w3c/lua/test176.scxml
index 97f8f51..7e5f460 100644
--- a/test/w3c/lua/test176.scxml
+++ b/test/w3c/lua/test176.scxml
@@ -19,6 +19,11 @@ aParam in event1 is 2 so that var2 gets set to 2, success, otherwise failure  --
     <transition event="*" target="fail"/>
   </state>
   <state id="s1">
+		<onentry>
+			<log label="asdfasdf" expr="testvar2" />
+			<log label="123123" expr="_event.data.aParam" />
+			
+		</onentry>
     <transition cond="testvar2 == 2" target="pass"/>
     <transition target="fail"/>
   </state>
diff --git a/test/w3c/lua/test178.scxml b/test/w3c/lua/test178.scxml
index 11361e1..c4df704 100644
--- a/test/w3c/lua/test178.scxml
+++ b/test/w3c/lua/test178.scxml
@@ -13,11 +13,11 @@ inspection.) -->
         <param expr="3" name="testvar1"/>
       </send>
     </onentry>
-    <transition event="event1" target="final">
+    <transition event="event1" target="pass">
       <log label="_event " expr="_event:inspect(true)"/>
     </transition>
     <transition event="*" target="fail"/>
   </state>
-  <final id="final"/>
+  <final id="pass"/>
   <final id="fail"/>
 </scxml>
diff --git a/test/w3c/lua/test183.scxml b/test/w3c/lua/test183.scxml
index 2b36df9..13378c9 100644
--- a/test/w3c/lua/test183.scxml
+++ b/test/w3c/lua/test183.scxml
@@ -7,7 +7,7 @@ var1 has a value and we pass.  Otherwise we fail  -->
   </datamodel>
   <state id="s0">
     <onentry>
-      <send event="event1" idlocation="'testvar1'"/>
+      <send event="event1" idlocation="testvar1"/>
     </onentry>
     <transition cond="testvar1 ~= nil" target="pass"/>
     <transition target="fail"/>
diff --git a/test/w3c/lua/test187.scxml b/test/w3c/lua/test187.scxml
index 48aac56..0b6daa1 100644
--- a/test/w3c/lua/test187.scxml
+++ b/test/w3c/lua/test187.scxml
@@ -6,7 +6,7 @@ parent session, should not receive childToParent. If it does, we fail.  Otherwis
 <scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="lua">
   <state id="s0">
     <onentry>
-      <send event="timeout" delay="100ms"/>
+      <send event="timeout" delay="400ms"/>
     </onentry>
     <invoke type="scxml">
       <content>
@@ -14,7 +14,7 @@ parent session, should not receive childToParent. If it does, we fail.  Otherwis
         <scxml initial="sub0" version="1.0" datamodel="lua">
           <state id="sub0">
             <onentry>
-              <send event="childToParent" target="#_parent" delay="0ms"/>
+              <send event="childToParent" target="#_parent" delay="40ms"/>
             </onentry>
             <transition target="subFinal"/>
           </state>
diff --git a/test/w3c/lua/test223.scxml b/test/w3c/lua/test223.scxml
index 92cf1a9..dcbf061 100644
--- a/test/w3c/lua/test223.scxml
+++ b/test/w3c/lua/test223.scxml
@@ -8,7 +8,7 @@
     <onentry>
       <send event="timeout" delay="1s"/>
     </onentry>
-    <invoke type="http://www.w3.org/TR/scxml/" idlocation="'testvar1'">
+    <invoke type="http://www.w3.org/TR/scxml/" idlocation="testvar1">
       <content>
         <!-- when invoked, terminate returning done.invoke. This proves that the invocation succeeded.   -->
         <scxml initial="subFinal" version="1.0" datamodel="lua">
diff --git a/test/w3c/lua/test224.scxml b/test/w3c/lua/test224.scxml
index 7a095e0..acca9f6 100644
--- a/test/w3c/lua/test224.scxml
+++ b/test/w3c/lua/test224.scxml
@@ -9,7 +9,7 @@
     <onentry>
       <send event="timeout" delay="1s"/>
     </onentry>
-    <invoke type="http://www.w3.org/TR/scxml/" idlocation="'testvar1'">
+    <invoke type="http://www.w3.org/TR/scxml/" idlocation="testvar1">
       <content>
         <!-- when invoked, terminate returning done.invoke. This proves that the invocation succeeded.   -->
         <scxml version="1.0" initial="subFinal" datamodel="lua">
diff --git a/test/w3c/lua/test225.scxml b/test/w3c/lua/test225.scxml
index d370f9b..17f80c3 100644
--- a/test/w3c/lua/test225.scxml
+++ b/test/w3c/lua/test225.scxml
@@ -9,14 +9,14 @@
     <onentry>
       <send event="timeout" delay="1s"/>
     </onentry>
-    <invoke type="http://www.w3.org/TR/scxml/" idlocation="'testvar1'">
+    <invoke type="http://www.w3.org/TR/scxml/" idlocation="testvar1">
       <content>
         <scxml initial="subFinal1" version="1.0" datamodel="lua">
           <final id="subFinal1"/>
         </scxml>
       </content>
     </invoke>
-    <invoke type="http://www.w3.org/TR/scxml/" idlocation="'testvar2'">
+    <invoke type="http://www.w3.org/TR/scxml/" idlocation="testvar2">
       <content>
         <scxml initial="subFinal2" version="1.0" datamodel="lua">
           <final id="subFinal2"/>
diff --git a/test/w3c/lua/test463.scxml b/test/w3c/lua/test463.scxml
deleted file mode 100644
index 23ca9cf..0000000
--- a/test/w3c/lua/test463.scxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that the <data> tag creates an element in the XML datamodel with the correct name and id attr
-and binds an XPath variable to it -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="foo" expr="2"/>
-  </datamodel>
-  <state id="s0">
-    <transition cond="local-name($foo)='data'and $foo/@id ='foo'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test464.scxml b/test/w3c/lua/test464.scxml
deleted file mode 100644
index ddbef86..0000000
--- a/test/w3c/lua/test464.scxml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that an unassigned variable creates an empty <data> element -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="foo"/>
-  </datamodel>
-  <state id="s0">
-    <transition cond="count($foo) = 1 and count($foo/*) = 0" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test465.scxml b/test/w3c/lua/test465.scxml
deleted file mode 100644
index 50e708a..0000000
--- a/test/w3c/lua/test465.scxml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that all xpath variables are in a single global scope-->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="foo" expr="2"/>
-  </datamodel>
-  <state id="s0">
-    <transition cond="count($foo) = 1 and count($bar) = 1" target="s1"/>
-    <transition target="fail"/>
-  </state>
-  <state id="s1">
-    <datamodel>
-      <data id="bar" expr="1"/>
-    </datamodel>
-    <transition target="pass"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test466.scxml b/test/w3c/lua/test466.scxml
deleted file mode 100644
index 51896b4..0000000
--- a/test/w3c/lua/test466.scxml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that xpath expressions are converted to boolean when used as conditional expressions-->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="foo" expr="2"/>
-  </datamodel>
-  <state id="s0">
-    <transition cond="$foo" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test467.scxml b/test/w3c/lua/test467.scxml
deleted file mode 100644
index 673a561..0000000
--- a/test/w3c/lua/test467.scxml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that in() is available -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <state id="s0">
-    <transition cond="In('s0')" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test468.scxml b/test/w3c/lua/test468.scxml
deleted file mode 100644
index 8c0c74a..0000000
--- a/test/w3c/lua/test468.scxml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that XPath expressions can be used as location expressions.
- This example is taken from the spec -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cities">
-      <list>
-        <city id="nyc" count="0">New York</city>
-        <city id="bos" count="0">Boston</city>
-      </list>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cities/list/city[@id='nyc']/@count" expr="1"/>
-    </onentry>
-    <transition cond="$cities/list/city[@id='nyc']/@count = 1" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test469.scxml b/test/w3c/lua/test469.scxml
deleted file mode 100644
index 487029d..0000000
--- a/test/w3c/lua/test469.scxml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that XPath expressions can be used as value expressions. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="copyOfEventData"/>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <send event="event1">
-        <param name="param1" expr="1"/>
-      </send>
-    </onentry>
-    <transition event="event1" target="s1">
-      <assign location="$copyOfEventData" expr="$_event/data"/>
-    </transition>
-  </state>
-  <state id="s1">
-    <transition cond="$copyOfEventData/data/data[@id='param1'] =1" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test470.scxml b/test/w3c/lua/test470.scxml
deleted file mode 100644
index 68d55bc..0000000
--- a/test/w3c/lua/test470.scxml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that the processor makes a deep copy of a node set when assigning. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="var1">
-      <foo>
-        <bar>2</bar>
-      </foo>
-    </data>
-    <data id="var2"/>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$var2" expr="$var1/foo"/>
-      <assign location="$var1/foo/bar" expr="3"/>
-    </onentry>
-    <transition cond="$var2/foo/bar=2" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test473.scxml b/test/w3c/lua/test473.scxml
deleted file mode 100644
index 45dfb40..0000000
--- a/test/w3c/lua/test473.scxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that 'replacechildren' in <assign> replaces all children with the new value.
- This example is taken from the doc -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cart/myCart/books/book[1]">
-        <bookinfo>
-          <isdn>12334455</isdn>
-          <author>some author</author>
-        </bookinfo>
-      </assign>
-    </onentry>
-    <transition cond="$cart/myCart/books/book[1]/bookinfo/isdn/text() = '12334455'     and not($cart/myCart/books/book[1]/title)" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test474.scxml b/test/w3c/lua/test474.scxml
deleted file mode 100644
index fdbce30..0000000
--- a/test/w3c/lua/test474.scxml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that 'firstchild' in <assign> inserts the new value before the other children. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cart/myCart/books/book[1]" type="firstchild">
-        <bookinfo>
-          <isdn>12334455</isdn>
-          <author>some author</author>
-        </bookinfo>
-      </assign>
-    </onentry>
-    <transition cond="$cart/myCart/books/book[1]/*[1]/isdn/text() = '12334455'    and $cart/myCart/books/book[1]/*[2]/text() = 'The Zen Mind'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test475.scxml b/test/w3c/lua/test475.scxml
deleted file mode 100644
index dc01a91..0000000
--- a/test/w3c/lua/test475.scxml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that 'lastchild' in <assign> inserts the new value after the other children. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cart/myCart/books/book[1]" type="lastchild">
-        <bookinfo>
-          <isdn>12334455</isdn>
-          <author>some author</author>
-        </bookinfo>
-      </assign>
-    </onentry>
-    <transition cond="$cart/myCart/books/book[1]/*[2]/isdn/text() = '12334455'    and $cart/myCart/books/book[1]/*[1]/text() = 'The Zen Mind'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test476.scxml b/test/w3c/lua/test476.scxml
deleted file mode 100644
index fcb7bd9..0000000
--- a/test/w3c/lua/test476.scxml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that 'nextsibling' in <assign> inserts the new value after the location. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cart/myCart/books/book[1]/title" type="nextsibling">
-        <bookinfo>
-          <isdn>12334455</isdn>
-          <author>some author</author>
-        </bookinfo>
-      </assign>
-    </onentry>
-    <transition cond="$cart/myCart/books/book[1]/*[2]/isdn/text() = '12334455'    and $cart/myCart/books/book[1]/*[1]/text() = 'The Zen Mind'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test477.scxml b/test/w3c/lua/test477.scxml
deleted file mode 100644
index b9ebba9..0000000
--- a/test/w3c/lua/test477.scxml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that 'previoussibling' in <assign> inserts the new value before the location. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cart/myCart/books/book[1]/title" type="previoussibling">
-        <bookinfo>
-          <isdn>12334455</isdn>
-          <author>some author</author>
-        </bookinfo>
-      </assign>
-    </onentry>
-    <transition cond="$cart/myCart/books/book[1]/*[1]/isdn/text() = '12334455'    and $cart/myCart/books/book[1]/*[2]/text() = 'The Zen Mind'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test478.scxml b/test/w3c/lua/test478.scxml
deleted file mode 100644
index d687487..0000000
--- a/test/w3c/lua/test478.scxml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that 'replace' in <assign> replaces the value at the location. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cart/myCart/books/book[2]" type="replace">
-        <cd>
-          <title>This is not a book</title>
-        </cd>
-      </assign>
-    </onentry>
-    <transition cond="$cart/myCart/books/cd/title = 'This is not a book'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test479.scxml b/test/w3c/lua/test479.scxml
deleted file mode 100644
index a26ae7b..0000000
--- a/test/w3c/lua/test479.scxml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that 'delete' in <assign> deletes the value at the location. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cart/myCart/cds" type="delete">
-        <cd>
-          <title>This is not a book</title>
-        </cd>
-      </assign>
-    </onentry>
-    <transition cond="not($cart/myCart/cds)" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test480.scxml b/test/w3c/lua/test480.scxml
deleted file mode 100644
index 866444f..0000000
--- a/test/w3c/lua/test480.scxml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that 'addattr' in <assign> adds an attribute to the specified node. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cart/myCart/books/book[1]" type="addattribute" attr="author" expr="'somebody'"/>
-    </onentry>
-    <transition cond="$cart/myCart/books/book[1]/@author = 'somebody'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test481.scxml b/test/w3c/lua/test481.scxml
deleted file mode 100644
index 930b60d..0000000
--- a/test/w3c/lua/test481.scxml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that illegal assignments fail and have no side effects. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <send event="timeout" delay="3s"/>
-      <assign location="$cart/myCart/cds/cd/@name">
-        <foo>
-          <bar/>
-        </foo>
-      </assign>
-    </onentry>
-    <transition event="error.execution" cond="$cart/myCart/cds/cd/@name = 'Something'" target="pass"/>
-    <transition event="*" target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test482.scxml b/test/w3c/lua/test482.scxml
deleted file mode 100644
index 33b35a6..0000000
--- a/test/w3c/lua/test482.scxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that system vars are created and bound to XPath variables -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
-  <state id="s0">
-    <onentry>
-      <!-- event isn't bound until an event is raised -->
-      <raise event="someevent"/>
-    </onentry>
-    <transition event="*" cond="local-name($_event) = 'data'     and local-name($_sessionid) = 'data'      and local-name($_name) = 'data'      and local-name($_ioprocessors) = 'data'" target="pass"/>
-    <transition event="*" target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test483.scxml b/test/w3c/lua/test483.scxml
deleted file mode 100644
index 375ca05..0000000
--- a/test/w3c/lua/test483.scxml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that foreach works correctly, iterating over node set in document order.
- This tests assertions 483-485 -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="var1">
-      <nodes>
-        <node/>
-        <node/>
-        <node/>
-      </nodes>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <foreach array="$var1/nodes/node" item="item" index="pos">
-        <assign location="$item" type="addattribute" attr="position" expr="$pos"/>
-      </foreach>
-    </onentry>
-    <transition cond="$var1/nodes/node[1]/@position = 1 and  $var1/nodes/node[2]/@position = 2 and $var1/nodes/node[3]/@position = 3" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test537.scxml b/test/w3c/lua/test537.scxml
deleted file mode 100644
index a231a97..0000000
--- a/test/w3c/lua/test537.scxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that the root element of the datamodel is <datamodel> and that <data> elements are its
-children-->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="foo" expr="2"/>
-  </datamodel>
-  <state id="s0">
-    <transition cond="local-name($foo/..)='datamodel'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test539.scxml b/test/w3c/lua/test539.scxml
deleted file mode 100644
index fced2e6..0000000
--- a/test/w3c/lua/test539.scxml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that if the child of <data> is XML, or if XML is loaded via src=, the processor
- assigns it as the value of the var -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="var1">
-      <books>
-        <book title="title1"/>
-        <book title="title2"/>
-      </books>
-    </data>
-    <data id="var2" src="file:test539.txt"/>
-  </datamodel>
-  <state id="s0">
-    <transition cond="$var1/books/book[2]/@title = 'title2'" target="s1"/>
-    <transition target="fail"/>
-  </state>
-  <state id="s1">
-    <transition cond="$var2/books/book[2]/@title = 'title2'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test540.scxml b/test/w3c/lua/test540.scxml
deleted file mode 100644
index b0298b7..0000000
--- a/test/w3c/lua/test540.scxml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that if the child of <data> is a string or if a string is loaded via src=, the processor
- does white space normalization on it and assigns it as the value of the var -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="var1">123
-4  5  
-</data>
-    <data id="var2" src="file:test540.txt"/>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <log label="var1 " expr="$var1"/>
-    </onentry>
-    <transition cond="$var1 = '123 4 5' and $var2 = '123 4 5'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test542.scxml b/test/w3c/lua/test542.scxml
deleted file mode 100644
index 69b6ea3..0000000
--- a/test/w3c/lua/test542.scxml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that <content> inside <donedata> handles XML and strings,
- including white space normalization. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <state id="s0" initial="s01">
-    <transition event="done.state.s0" cond="$_event/data/books/book[1]/@title = 'title1'" target="s1"/>
-    <transition event="done" target="fail"/>
-    <final id="s01">
-      <donedata>
-        <content>
-          <books>
-            <book title="title1"/>
-            <book title="title2"/>
-          </books>
-        </content>
-      </donedata>
-    </final>
-  </state>
-  <state id="s1" initial="s11">
-    <transition event="done.state.s1" cond="$_event/data = '123 4 5'" target="pass"/>
-    <transition event="done" target="fail"/>
-    <final id="s11">
-      <donedata>
-        <content>123
-4 5 
-       </content>
-      </donedata>
-    </final>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test543.scxml b/test/w3c/lua/test543.scxml
deleted file mode 100644
index 55946ed..0000000
--- a/test/w3c/lua/test543.scxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that event fields are present as children of _event -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
-  <state id="s0">
-    <onentry>
-      <!-- event isn't bound until an event is raised -->
-      <raise event="someevent"/>
-    </onentry>
-    <!-- origintype sendid, invokeid and data will not be bound in this event. name, type, and origin
-  are guaranteed to be there. -->
-    <transition event="*" cond="$_event/name and $_event/origin and $_event/type" target="pass"/>
-    <transition event="*" target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test544.scxml b/test/w3c/lua/test544.scxml
deleted file mode 100644
index 5d935ab..0000000
--- a/test/w3c/lua/test544.scxml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that kvps are represented as <data> elements under event/data -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
-  <state id="s0">
-    <onentry>
-      <send event="someevent">
-        <param name="key1" expr="2"/>
-      </send>
-    </onentry>
-    <transition event="*" cond="$_event/data/data[@id='key1'] = 2" target="pass"/>
-    <transition event="*" target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test545.scxml b/test/w3c/lua/test545.scxml
deleted file mode 100644
index 7443ff2..0000000
--- a/test/w3c/lua/test545.scxml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that xml content in send is place as XML under event/data -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
-  <state id="s0">
-    <onentry>
-      <send event="someevent">
-        <content>
-          <foo>
-            <bar>3</bar>
-          </foo>
-        </content>
-      </send>
-    </onentry>
-    <transition event="*" cond="$_event/data/foo/bar = 3" target="pass"/>
-    <transition event="*" target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test546.scxml b/test/w3c/lua/test546.scxml
deleted file mode 100644
index 68efb84..0000000
--- a/test/w3c/lua/test546.scxml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that string content in send is place as a string under event/data -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
-  <state id="s0">
-    <onentry>
-      <send event="someevent">
-        <content>some string</content>
-      </send>
-    </onentry>
-    <transition event="*" cond="$_event/data = 'some string'" target="pass"/>
-    <transition event="*" target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test547.scxml b/test/w3c/lua/test547.scxml
deleted file mode 100644
index 26e5cc8..0000000
--- a/test/w3c/lua/test547.scxml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that assiging to a node set performs the assignment to each node.
- This example is taken from the spec. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="cart">
-      <myCart>
-        <books>
-          <book>
-            <title>The Zen Mind</title>
-          </book>
-          <book>
-            <title>Freakonomics</title>
-          </book>
-        </books>
-        <cds>
-          <cd name="Something"/>
-        </cds>
-      </myCart>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <assign location="$cart/myCart/books/book" expr="'The Zen Mind'"/>
-    </onentry>
-    <transition cond="$cart/myCart/books/book[1] = 'The Zen Mind' and  $cart/myCart/books/book[2] = 'The Zen Mind'" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test555.scxml b/test/w3c/lua/test555.scxml
deleted file mode 100644
index 2609689..0000000
--- a/test/w3c/lua/test555.scxml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- in the XPATH data model, test that processor coerces types to produce a string
- where it's needed -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <datamodel>
-    <data id="var1">
-      <books>
-        <book title="title1"/>
-        <book title="title2"/>
-      </books>
-    </data>
-  </datamodel>
-  <state id="s0">
-    <onentry>
-      <send eventexpr="$var1"/>
-    </onentry>
-    <transition event="error" target="fail"/>
-    <!-- don't really know what the stringification of that xml structure should  be, but if
-  we get something other than an error, we assume that it worked. -->
-    <transition event="*" target="pass"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>
diff --git a/test/w3c/lua/test568.scxml b/test/w3c/lua/test568.scxml
deleted file mode 100644
index aaa1023..0000000
--- a/test/w3c/lua/test568.scxml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- test that location field is found inside entry for SCXML Event I/O processor in the XPath
-data model.  The tests for the relevant event i/o processors will test that it can be used to
-send events. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="xpath">
-  <state id="s0">
-    <transition cond="$_ioprocessors/[@name='http://www.w3.org/TR/scxml/#SCXMLEventProcessor']/location/text()" target="pass"/>
-    <transition target="fail"/>
-  </state>
-  <final id="pass"/>
-  <final id="fail"/>
-</scxml>