Support namelist attribute and <param> in <invoke>.

Change-Id: If608c472c7a280b922e65a41173ac88b353c8d14
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>

3 files changed, 13 insertions, 25 deletions

diff --git a/tests/3rdparty/scion-tests/scxml-test-framework/test/w3c-ecma/test240.txml.scxml b/tests/3rdparty/scion-tests/scxml-test-framework/test/w3c-ecma/test240.txml.scxml
index 6d74d4c..a2b17e1 100644
--- a/tests/3rdparty/scion-tests/scxml-test-framework/test/w3c-ecma/test240.txml.scxml
+++ b/tests/3rdparty/scion-tests/scxml-test-framework/test/w3c-ecma/test240.txml.scxml
@@ -48,7 +48,7 @@ should run correctly. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:co
                       <transition cond="Var1==1" target="subFinal2">
                      <send target="#_parent" event="success"/>
                      </transition>
-                  <transition target="subFinal1">
+                  <transition target="subFinal2">
                  <send target="#_parent" event="failure"/>
                  </transition>
                </state>
@@ -64,4 +64,4 @@ should run correctly. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:co
  
 <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
 <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
-</scxml>
\ No newline at end of file
+</scxml>
diff --git a/tests/auto/scion/scion.pro b/tests/auto/scion/scion.pro
index d120936..fb94059 100644
--- a/tests/auto/scion/scion.pro
+++ b/tests/auto/scion/scion.pro
@@ -60,6 +60,7 @@ QMAKE_EXTRA_COMPILERS += scxml_moc_source
 SCXMLS_DIR += $$absolute_path($$PWD/../../3rdparty/scion-tests/scxml-test-framework/test)
 ALLSCXMLS = $$files($$SCXMLS_DIR/*.scxml, true)
 
+# For a better explanation about the "blacklisted" tests, see tst_scion.cpp
 # <invoke>
 BLACKLISTED = \
     test187.txml.scxml \
@@ -67,19 +68,9 @@ BLACKLISTED = \
     test215.txml.scxml \
     test216.txml.scxml \
     test226.txml.scxml \
-    test238.txml.scxml \
-    test239.txml.scxml \
-    test240.txml.scxml \
-    test241.txml.scxml \
-    test242.txml.scxml \
-    test243.txml.scxml \
-    test244.txml.scxml \
-    test245.txml.scxml \
-    test247.txml.scxml \
     test250.txml.scxml \
     test252.txml.scxml \
     test253.txml.scxml \
-    test276.txml.scxml \
     test338.txml.scxml \
     test422.txml.scxml \
     test530.txml.scxml \
@@ -92,6 +83,9 @@ BLACKLISTED += \
 
 # other
 BLACKLISTED += \
+    test239.txml.scxml \
+    test242.txml.scxml \
+    test276.txml.scxml \
     test301.txml.scxml \
     test441a.txml.scxml \
     test441b.txml.scxml \
diff --git a/tests/auto/scion/tst_scion.cpp b/tests/auto/scion/tst_scion.cpp
index 1e52cf4..fa8f9c2 100644
--- a/tests/auto/scion/tst_scion.cpp
+++ b/tests/auto/scion/tst_scion.cpp
@@ -50,23 +50,17 @@ static QSet<QString> weFailOnThese = QSet<QString>()
         // The following test needs manual inspection of the result.
         << QLatin1String("w3c-ecma/test230.txml")
         << QLatin1String("w3c-ecma/test307.txml")
-        // We do not (yet?) support invoke.
-        << QLatin1String("w3c-ecma/test215.txml")
-        << QLatin1String("w3c-ecma/test216.txml")
-        << QLatin1String("w3c-ecma/test226.txml")
-        << QLatin1String("w3c-ecma/test238.txml")
+        // We do not support the src attribute in invoke.
         << QLatin1String("w3c-ecma/test239.txml")
-        << QLatin1String("w3c-ecma/test240.txml")
-        << QLatin1String("w3c-ecma/test241.txml")
-        << QLatin1String("w3c-ecma/test243.txml")
-        << QLatin1String("w3c-ecma/test244.txml")
-        << QLatin1String("w3c-ecma/test245.txml")
-        << QLatin1String("w3c-ecma/test247.txml")
         << QLatin1String("w3c-ecma/test242.txml")
         << QLatin1String("w3c-ecma/test276.txml")
-        << QLatin1String("w3c-ecma/test253.txml")
-        << QLatin1String("w3c-ecma/test252.txml")
+        // TODO: after having implemented <invoke>, the following tests need to be re-verified.
+        << QLatin1String("w3c-ecma/test215.txml")
+        << QLatin1String("w3c-ecma/test216.txml")
+        << QLatin1String("w3c-ecma/test226.txml")
         << QLatin1String("w3c-ecma/test250.txml")
+        << QLatin1String("w3c-ecma/test252.txml")
+        << QLatin1String("w3c-ecma/test253.txml")
         << QLatin1String("w3c-ecma/test338.txml")
         << QLatin1String("w3c-ecma/test422.txml")
         << QLatin1String("w3c-ecma/test530.txml")