Got ready for cmake3 and some minor fixes

6 files changed, 11 insertions, 10 deletions

diff --git a/test/w3c/xpath/test252.scxml b/test/w3c/xpath/test252.scxml
index 1f92127..f8d93a5 100644
--- a/test/w3c/xpath/test252.scxml
+++ b/test/w3c/xpath/test252.scxml
@@ -5,7 +5,7 @@ timeout indicates success.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" x
      
 <state id="s0" initial="s01">
   <onentry>
-    <send event="timeout" delay="2s"/>
+    <send event="timeout" delayexpr="'1s'"/>
     </onentry>
     
     <transition event="timeout" target="pass"/>
@@ -22,7 +22,7 @@ timeout indicates success.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" x
          <scxml initial="sub0" version="1.0" datamodel="xpath">
               <state id="sub0">
              <onentry>
-             <send event="timeout" delay="2s"/>
+             <send event="timeout" delayexpr="'.5s'"/>
              </onentry> 
             <transition event="timeout" target="subFinal"/>
                <onexit>
diff --git a/test/w3c/xpath/test343.scxml b/test/w3c/xpath/test343.scxml
index bae14de..e3dbf53 100644
--- a/test/w3c/xpath/test343.scxml
+++ b/test/w3c/xpath/test343.scxml
@@ -14,7 +14,7 @@
    </state>
    <final id="s02">
      <donedata>
-      <param location="$Varfoo" name="someParam"/>
+      <param location="foo.bar.baz " name="someParam"/>
       </donedata>
      </final>
   </state>
diff --git a/test/w3c/xpath/test354.scxml b/test/w3c/xpath/test354.scxml
index 499b568..e75d382 100644
--- a/test/w3c/xpath/test354.scxml
+++ b/test/w3c/xpath/test354.scxml
@@ -37,10 +37,10 @@ and that correct values are used --><scxml xmlns="http://www.w3.org/2005/07/scxm
    <onentry>
      <send delay="5s" event="timeout"/>
     <send event="event2"> 
-      <content>foo</content>
+      <content>123</content>
       </send>
      </onentry>
-  <transition event="event2" cond="$_event/data = 'foo'" target="pass"/>
+  <transition event="event2" cond="_event.data = 123" target="pass"/>
   <transition event="*" target="fail"/>
 
 </state>
diff --git a/test/w3c/xpath/test487.scxml b/test/w3c/xpath/test487.scxml
index 9e6c441..cec2f64 100644
--- a/test/w3c/xpath/test487.scxml
+++ b/test/w3c/xpath/test487.scxml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><!-- test illegal assignment.  error.execution should be raised.  --><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="!1"/>
+  <data id="Var1"/>
   </datamodel>
      
 <state id="s0">
   <onentry>
+  	<assign location="$Var1" expr="!1"/>
    <raise event="event"/>
    </onentry>
    
diff --git a/test/w3c/xpath/test553.scxml b/test/w3c/xpath/test553.scxml
index 00bd1e8..90cd97c 100644
--- a/test/w3c/xpath/test553.scxml
+++ b/test/w3c/xpath/test553.scxml
@@ -6,8 +6,8 @@ of <send>'s args causes an error..  --><scxml xmlns="http://www.w3.org/2005/07/s
   <onentry>
    <!-- timeout event -->
    <send event="timeout" delayexpr="'1s'"/>
-   <!-- include a non-existing var in the namelist -->
-   <send event="event1" namelist="$Var2"/> 
+   <!-- generate an invalid namelist -->
+   <send event="event1" namelist="&#34;foo&#34;"/> 
     </onentry>
  
  <!-- if we get the timeout before event1, we assume that event1 hasn't been sent
diff --git a/test/w3c/xpath/test554.scxml b/test/w3c/xpath/test554.scxml
index 1a2b58a..74e25b3 100644
--- a/test/w3c/xpath/test554.scxml
+++ b/test/w3c/xpath/test554.scxml
@@ -8,8 +8,8 @@ before the timer goes off.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xm
     <send event="timer" delayexpr="'1s'"/>
     </onentry>
     
-  <!-- namelist references an undeclared variable -->
-   <invoke type="http://www.w3.org/TR/scxml/" namelist="$Var2">
+  <!-- reference an invalid namelist -->
+   <invoke type="http://www.w3.org/TR/scxml/" namelist="&#34;foo&#34;">
       <content>
        <scxml initial="subFinal" version="1.0" datamodel="xpath">
              <final id="subFinal"/>