Got ready for cmake3 and some minor fixes

6 files changed, 11 insertions, 10 deletions

diff --git a/test/w3c/txml/test252.txml b/test/w3c/txml/test252.txml
index 40c36cb..ba43543 100644
--- a/test/w3c/txml/test252.txml
+++ b/test/w3c/txml/test252.txml
@@ -9,7 +9,7 @@ timeout indicates success.   -->
      
 <state id="s0" initial="s01">
   <onentry>
-    <send event="timeout" delay="2s"/>
+    <send event="timeout" conf:delay="1"/>
     </onentry>
     
     <transition event="timeout" conf:targetpass=""/>
@@ -26,7 +26,7 @@ timeout indicates success.   -->
          <scxml initial="sub0" version="1.0" conf:datamodel=""  xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
               <state id="sub0">
              <onentry>
-             <send event="timeout" delay="2s"/>
+             <send event="timeout" conf:delay=".5"/>
              </onentry> 
             <transition event="timeout" target="subFinal"/>
                <onexit>
diff --git a/test/w3c/txml/test343.txml b/test/w3c/txml/test343.txml
index 1d13da6..f0aba04 100644
--- a/test/w3c/txml/test343.txml
+++ b/test/w3c/txml/test343.txml
@@ -17,7 +17,7 @@
    </state>
    <final id="s02">
      <donedata>
-      <param conf:location="foo" name="someParam"/>
+      <param conf:invalidLocation="foo" name="someParam"/>
       </donedata>
      </final>
   </state>
diff --git a/test/w3c/txml/test354.txml b/test/w3c/txml/test354.txml
index 0f1f6c5..890b6ef 100644
--- a/test/w3c/txml/test354.txml
+++ b/test/w3c/txml/test354.txml
@@ -41,10 +41,10 @@ and that correct values are used -->
    <onentry>
      <send delay="5s" event="timeout"/>
     <send  event="event2"> 
-      <content>foo</content>
+      <content><conf:someInlineVal/></content>
       </send>
      </onentry>
-  <transition event="event2" conf:eventdataVal="'foo'" conf:targetpass=""/>
+  <transition event="event2" conf:eventdataSomeVal="" conf:targetpass=""/>
   <transition event="*" conf:targetfail=""/>
 
 </state>
diff --git a/test/w3c/txml/test487.txml b/test/w3c/txml/test487.txml
index 7210c2b..fe7423c 100644
--- a/test/w3c/txml/test487.txml
+++ b/test/w3c/txml/test487.txml
@@ -4,11 +4,12 @@
 
 <scxml  initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
 <datamodel>
-  <data conf:id="1" conf:illegalExpr=""/>
+  <data conf:id="1"/>
   </datamodel>
      
 <state id="s0">
   <onentry>
+  	<assign conf:location="1" conf:illegalExpr=""/>
    <raise event="event"/>
    </onentry>
    
diff --git a/test/w3c/txml/test553.txml b/test/w3c/txml/test553.txml
index 0c6a622..b9dfece 100644
--- a/test/w3c/txml/test553.txml
+++ b/test/w3c/txml/test553.txml
@@ -10,8 +10,8 @@ of <send>'s args causes an error..  -->
   <onentry>
    <!-- timeout event -->
    <send event="timeout" conf:delay="1"/>
-   <!-- include a non-existing var in the namelist -->
-   <send event="event1" conf:namelist="2"/> 
+   <!-- generate an invalid namelist -->
+   <send event="event1" conf:invalidNamelist=""/> 
     </onentry>
  
  <!-- if we get the timeout before event1, we assume that event1 hasn't been sent
diff --git a/test/w3c/txml/test554.txml b/test/w3c/txml/test554.txml
index 663424f..9e16cf8 100644
--- a/test/w3c/txml/test554.txml
+++ b/test/w3c/txml/test554.txml
@@ -12,8 +12,8 @@ before the timer goes off.  -->
     <send event="timer" conf:delay="1"/>
     </onentry>
     
-  <!-- namelist references an undeclared variable -->
-   <invoke type="http://www.w3.org/TR/scxml/" conf:namelist="2">
+  <!-- reference an invalid namelist -->
+   <invoke type="http://www.w3.org/TR/scxml/" conf:invalidNamelist="">
       <content>
        <scxml initial="subFinal" version="1.0" conf:datamodel=""  xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
              <final id="subFinal"/>