From 0b67b42e70e9b40af1be760a06016bb936d0ae17 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 6 Jan 2017 15:31:28 +0100
Subject: Make the content/expr test compliant

We cannot add both an 'event' attribute and a <content> element to
<send>, and we cannot match anonymous events in transitions. We can
receive them in the C++ code, though.

Change-Id: Ieef7aba3fee79181c56002a0334f9f8e4af4df14
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
---
 .../test/content-expr-in-send/test0.txml.json            |  7 ++++++-
 .../test/content-expr-in-send/test0.txml.scxml           | 16 ++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/3rdparty/scion-tests/scxml-test-framework/test/content-expr-in-send/test0.txml.json b/tests/3rdparty/scion-tests/scxml-test-framework/test/content-expr-in-send/test0.txml.json
index 2b697c0..277863c 100644
--- a/tests/3rdparty/scion-tests/scxml-test-framework/test/content-expr-in-send/test0.txml.json
+++ b/tests/3rdparty/scion-tests/scxml-test-framework/test/content-expr-in-send/test0.txml.json
@@ -1,4 +1,9 @@
 {
     "initialConfiguration" : ["pass"],
-    "events" : []
+    "expectedEvents" : [
+        { "data" : "blah" },
+        { "name" : "timeout", "data" : {"p" : "v"} },
+        { "data" : {"p" : "v"} },
+        { "name" : "timeout" }
+    ]
 }
diff --git a/tests/3rdparty/scion-tests/scxml-test-framework/test/content-expr-in-send/test0.txml.scxml b/tests/3rdparty/scion-tests/scxml-test-framework/test/content-expr-in-send/test0.txml.scxml
index 4cfa34a..f62bc55 100644
--- a/tests/3rdparty/scion-tests/scxml-test-framework/test/content-expr-in-send/test0.txml.scxml
+++ b/tests/3rdparty/scion-tests/scxml-test-framework/test/content-expr-in-send/test0.txml.scxml
@@ -3,24 +3,28 @@
        name="content-expr-in-send" datamodel="ecmascript">
     <state id="top">
         <onentry>
-            <send event="timeout" delay="2s"/>
-            <send event="to_second">
+            <send>
                 <content>blah</content>
             </send>
+            <send event="timeout">
+                <param name="p" expr="'v'"/>
+            </send>
+
         </onentry>
+
         <state id="first">
-            <transition event="to_second" target="second"/>
+            <transition event="timeout" target="second"/>
         </state>
 
         <state id="second">
             <onentry>
-                <send event="to_pass">
+                <send>
                     <content expr="_event.data"/>
                 </send>
+                <send event="timeout"/>
             </onentry>
+            <transition event="timeout" target="pass"/>
         </state>
-        <transition event="to_pass" cond="_event.data=='blah'" target="pass"/>
-        <transition event="timeout" target="fail"/>
     </state>
 
     <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
-- 
cgit v1.2.3