Merge branch '2.0.0' of https://github.com/jbeard4/scxml-test-framework…

… into 2.0.0

test/send-idlocation/test0.json

@@ -0,0 +1,14 @@
+{
+    "initialConfiguration" : ["s0"],
+    "events" : [
+        {
+            "event" : { "name" : "t1" },
+            "nextConfiguration" : ["s1"]
+        },
+        {
+            "after" : 100,
+            "event" : { "name" : "t2" },
+            "nextConfiguration" : ["pass"]
+        }
+    ]
+}

test/send-idlocation/test0.scxml

@@ -0,0 +1,45 @@
+<scxml xmlns="http://www.w3.org/2005/07/scxml"
+  version="1.0"
+  initial="uber">
+
+  <datamodel>
+    <data id="httpid" expr="'foo'"/>
+  </datamodel>
+
+
+  <state id="uber">
+
+    <state id="s0">
+      <onentry>
+        <!-- make sure we do not clobber send/@id when id is $scion.sendid* -->
+        <send id="$scion.sendid0" event="ignore" delay="1ms" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+        <send idlocation="httpid" event="ignore" delay="2ms" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+      </onentry>
+      <transition event="t1" target="s1"/>
+    </state>
+    <state id="s1">
+      <onentry>
+        <log label="httpid" expr="httpid" />
+      </onentry>
+      <transition event="t2" target="pass" cond="httpid !== 'foo' &amp;&amp; httpid !== '$scion.sendid0'"/>
+      <transition event="t2" target="fail"/>
+    </state>
+    <state id="s2">
+      <transition event="t2" target="pass"/>
+    </state>
+  </state>
+
+  <final id="pass">
+    <onentry>
+      <log expr="'RESULT: pass'" label="TEST"/>
+    </onentry>
+  </final>
+
+  <final id="fail">
+    <onentry>
+      <log expr="'RESULT: fail'" label="TEST"/>
+    </onentry>
+  </final>
+
+</scxml>
+

test/w3c-ecma/test332.txml.scxml

@@ -26,4 +26,4 @@
    <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
    <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
 
-</scxml>
+</scxml>