Create default timeouts for tests and adapt in test-w3c via DOM

16 files changed, 25 insertions, 25 deletions

diff --git a/test/w3c/ecma/test175.scxml b/test/w3c/ecma/test175.scxml
index 1ec619f..6c69a25 100644
--- a/test/w3c/ecma/test175.scxml
+++ b/test/w3c/ecma/test175.scxml
@@ -9,8 +9,8 @@ event1 will be raised first.  Succeed if event1 occurs before event2, otherwise
   <state id="s0">
     <onentry>
       <assign location="Var1" expr="'1s'"/>
-      <send delayexpr="(Var1.slice(0, - 1)) * 50 + 'ms'" event="event2"/>
-      <send delayexpr="'25ms'" event="event1"/>
+      <send delayexpr="Var1" event="event2"/>
+      <send delayexpr="'.5s'" event="event1"/>
     </onentry>
     <transition event="event1" target="s1"/>
     <transition event="event2" target="fail"/>
diff --git a/test/w3c/ecma/test185.scxml b/test/w3c/ecma/test185.scxml
index 7e4c408..46bb4eb 100644
--- a/test/w3c/ecma/test185.scxml
+++ b/test/w3c/ecma/test185.scxml
@@ -4,7 +4,7 @@
 <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">
   <state id="s0">
     <onentry>
-      <send event="event2" delayexpr="'50ms'"/>
+      <send event="event2" delayexpr="'1s'"/>
       <send event="event1"/>
     </onentry>
     <transition event="event1" target="s1"/>
diff --git a/test/w3c/ecma/test186.scxml b/test/w3c/ecma/test186.scxml
index ef42d18..74d7a1a 100644
--- a/test/w3c/ecma/test186.scxml
+++ b/test/w3c/ecma/test186.scxml
@@ -9,7 +9,7 @@ in the interval.)  If var2 ends up == 1, we pass.  Otherwise we fail  -->
   </datamodel>
   <state id="s0">
     <onentry>
-      <send event="event1" delayexpr="'50ms'">
+      <send event="event1" delayexpr="'1s'">
         <param name="aParam" expr="Var1"/>
       </send>
       <assign location="Var1" expr="2"/>
diff --git a/test/w3c/ecma/test187.scxml b/test/w3c/ecma/test187.scxml
index 06b08a2..59b16ba 100644
--- a/test/w3c/ecma/test187.scxml
+++ b/test/w3c/ecma/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" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
   <state id="s0">
     <onentry>
-      <send event="timeout" delayexpr="'50ms'"/>
+      <send event="timeout" delay="1s"/>
     </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="ecmascript">
           <state id="sub0">
             <onentry>
-              <send event="childToParent" target="#_parent" delayexpr="'25ms'"/>
+              <send event="childToParent" target="#_parent" delayexpr="'.5s'"/>
             </onentry>
             <transition target="subFinal"/>
           </state>
diff --git a/test/w3c/ecma/test207.scxml b/test/w3c/ecma/test207.scxml
index 5b89697..a482e58 100644
--- a/test/w3c/ecma/test207.scxml
+++ b/test/w3c/ecma/test207.scxml
@@ -6,7 +6,7 @@ raised in another session, but the spec doesn't define any way to refer to an ev
 <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">
   <state id="s0" initial="s01">
     <onentry>
-      <send event="timeout" delayexpr="'100ms'"/>
+      <send event="timeout" delayexpr="'2s'"/>
     </onentry>
     <invoke type="scxml">
       <content>
@@ -16,8 +16,8 @@ raised in another session, but the spec doesn't define any way to refer to an ev
         <scxml initial="sub0" version="1.0" datamodel="ecmascript">
           <state id="sub0">
             <onentry>
-              <send event="event1" id="foo" delayexpr="'50ms'"/>
-              <send event="event2" delayexpr="'75ms'"/>
+              <send event="event1" id="foo" delayexpr="'1s'"/>
+              <send event="event2" delayexpr="'1.5s'"/>
               <send target="#_parent" event="childToParent"/>
             </onentry>
             <transition event="event1" target="subFinal">
diff --git a/test/w3c/ecma/test208.scxml b/test/w3c/ecma/test208.scxml
index ed0de3e..5aba798 100644
--- a/test/w3c/ecma/test208.scxml
+++ b/test/w3c/ecma/test208.scxml
@@ -4,8 +4,8 @@ we get event1 or an error first, cancel didn't work and we fail.  -->
 <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">
   <state id="s0">
     <onentry>
-      <send id="foo" event="event1" delayexpr="'50ms'"/>
-      <send event="event2" delayexpr="'75ms'"/>
+      <send id="foo" event="event1" delayexpr="'1s'"/>
+      <send event="event2" delayexpr="'1.5s'"/>
       <cancel sendid="foo"/>
     </onentry>
     <transition event="event2" target="pass"/>
diff --git a/test/w3c/ecma/test210.scxml b/test/w3c/ecma/test210.scxml
index 15d892d..146cbc8 100644
--- a/test/w3c/ecma/test210.scxml
+++ b/test/w3c/ecma/test210.scxml
@@ -7,8 +7,8 @@ delayed event1.  Thus we get event2 first and pass.  If we get event1 or an erro
   </datamodel>
   <state id="s0">
     <onentry>
-      <send id="foo" event="event1" delayexpr="'50ms'"/>
-      <send event="event2" delayexpr="'75ms'"/>
+      <send id="foo" event="event1" delayexpr="'1s'"/>
+      <send event="event2" delayexpr="'1.5s'"/>
       <assign location="Var1" expr="'foo'"/>
       <cancel sendidexpr="Var1"/>
     </onentry>
diff --git a/test/w3c/ecma/test236.scxml b/test/w3c/ecma/test236.scxml
index 2907f36..7fb258b 100644
--- a/test/w3c/ecma/test236.scxml
+++ b/test/w3c/ecma/test236.scxml
@@ -5,7 +5,7 @@ events after the done.invoke.  Hence timeout indicates success   -->
 <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">
   <state id="s0">
     <onentry>
-      <send event="timeout" delayexpr="'100ms'"/>
+      <send event="timeout" delayexpr="'2s'"/>
     </onentry>
     <invoke type="http://www.w3.org/TR/scxml/">
       <content>
diff --git a/test/w3c/ecma/test237.scxml b/test/w3c/ecma/test237.scxml
index 5453e33..cd54a86 100644
--- a/test/w3c/ecma/test237.scxml
+++ b/test/w3c/ecma/test237.scxml
@@ -6,7 +6,7 @@ the time timeout2 fires, success   -->
 <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">
   <state id="s0">
     <onentry>
-      <send event="timeout1" delayexpr="'50ms'"/>
+      <send event="timeout1" delayexpr="'1s'"/>
     </onentry>
     <invoke type="http://www.w3.org/TR/scxml/">
       <content>
@@ -14,7 +14,7 @@ the time timeout2 fires, success   -->
         <scxml initial="sub0" version="1.0" datamodel="ecmascript">
           <state id="sub0">
             <onentry>
-              <send event="timeout" delayexpr="'100ms'"/>
+              <send event="timeout" delayexpr="'2s'"/>
             </onentry>
             <transition event="timeout" target="subFinal"/>
           </state>
@@ -26,7 +26,7 @@ the time timeout2 fires, success   -->
   </state>
   <state id="s1">
     <onentry>
-      <send event="timeout2" delayexpr="'75ms'"/>
+      <send event="timeout2" delayexpr="'1.5s'"/>
     </onentry>
     <!-- here we should NOT get done.invoke -->
     <transition event="done.invoke" target="fail"/>
diff --git a/test/w3c/ecma/test252.scxml b/test/w3c/ecma/test252.scxml
index 4bdf7e7..78c9315 100644
--- a/test/w3c/ecma/test252.scxml
+++ b/test/w3c/ecma/test252.scxml
@@ -5,7 +5,7 @@ timeout indicates success.   -->
 <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">
   <state id="s0" initial="s01">
     <onentry>
-      <send event="timeout" delayexpr="'50ms'"/>
+      <send event="timeout" delayexpr="'1s'"/>
     </onentry>
     <transition event="timeout" target="pass"/>
     <transition event="childToParent" target="fail"/>
@@ -19,7 +19,7 @@ timeout indicates success.   -->
           <scxml initial="sub0" version="1.0" datamodel="ecmascript">
             <state id="sub0">
               <onentry>
-                <send event="timeout" delayexpr="'25ms'"/>
+                <send event="timeout" delayexpr="'.5s'"/>
               </onentry>
               <transition event="timeout" target="subFinal"/>
               <onexit>
diff --git a/test/w3c/ecma/test409.scxml b/test/w3c/ecma/test409.scxml
index 5cb5865..325d01c 100644
--- a/test/w3c/ecma/test409.scxml
+++ b/test/w3c/ecma/test409.scxml
@@ -5,7 +5,7 @@ be raised.  Therefore the timeout should fire to indicate success   -->
 <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">
   <state id="s0" initial="s01">
     <onentry>
-      <send event="timeout" delayexpr="'50ms'"/>
+      <send event="timeout" delayexpr="'1s'"/>
     </onentry>
     <transition event="timeout" target="pass"/>
     <transition event="event1" target="fail"/>
diff --git a/test/w3c/ecma/test422.scxml b/test/w3c/ecma/test422.scxml
index 91ba18d..383dd1b 100644
--- a/test/w3c/ecma/test422.scxml
+++ b/test/w3c/ecma/test422.scxml
@@ -12,7 +12,7 @@ in s11. So we should receive invokeS1, invokeS12, but not invokeS12.  Furthermor
   </datamodel>
   <state id="s1" initial="s11">
     <onentry>
-      <send event="timeout" delayexpr="'100ms'"/>
+      <send event="timeout" delayexpr="'2s'"/>
     </onentry>
     <transition event="invokeS1 invokeS12">
       <assign location="Var1" expr="Var1 + 1"/>
diff --git a/test/w3c/ecma/test423.scxml b/test/w3c/ecma/test423.scxml
index 3fc15d3..9726441 100644
--- a/test/w3c/ecma/test423.scxml
+++ b/test/w3c/ecma/test423.scxml
@@ -4,7 +4,7 @@
   <state id="s0">
     <onentry>
       <send event="externalEvent1"/>
-      <send event="externalEvent2" delayexpr="'50ms'"/>
+      <send event="externalEvent2" delayexpr="'1s'"/>
       <raise event="internalEvent"/>
     </onentry>
     <!-- in this state we should process only internalEvent -->
diff --git a/test/w3c/ecma/test553.scxml b/test/w3c/ecma/test553.scxml
index 8ccfd5a..302caca 100644
--- a/test/w3c/ecma/test553.scxml
+++ b/test/w3c/ecma/test553.scxml
@@ -5,7 +5,7 @@ of <send>'s args causes an error..  -->
   <state id="s0">
     <onentry>
       <!-- timeout event -->
-      <send event="timeout" delayexpr="'50ms'"/>
+      <send event="timeout" delayexpr="'1s'"/>
       <!-- generate an invalid namelist -->
       <send event="event1" namelist="&quot;foo"/>
     </onentry>
diff --git a/test/w3c/ecma/test554.scxml b/test/w3c/ecma/test554.scxml
index 7ef3597..e7dde01 100644
--- a/test/w3c/ecma/test554.scxml
+++ b/test/w3c/ecma/test554.scxml
@@ -5,7 +5,7 @@ before the timer goes off.  -->
 <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">
   <state id="s0">
     <onentry>
-      <send event="timer" delayexpr="'50ms'"/>
+      <send event="timer" delayexpr="'1s'"/>
     </onentry>
     <!-- reference an invalid namelist -->
     <invoke type="http://www.w3.org/TR/scxml/" namelist="&quot;foo">
diff --git a/test/w3c/ecma/test579.scxml b/test/w3c/ecma/test579.scxml
index dbf7dc1..165b990 100644
--- a/test/w3c/ecma/test579.scxml
+++ b/test/w3c/ecma/test579.scxml
@@ -14,7 +14,7 @@ parent state has been visited and exited, the default history content must not b
       </transition>
     </initial>
     <onentry>
-      <send delayexpr="'50ms'" event="timeout"/>
+      <send delayexpr="'1s'" event="timeout"/>
       <raise event="event1"/>
     </onentry>
     <onexit>