diff options
| author | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-11-27 11:02:42 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-12-01 14:09:20 +0000 |
| commit | 6fe8bb82de7bf3163abd7660b250c1f4a3b9b8c4 (patch) | |
| tree | 08fdf843b9bdda41d4588bcc521fe3196541bf40 /tests | |
| parent | b9659744acecb25887570049d7ce2bc41b974b93 (diff) | |
Clean up the state-machine initialization.
Change-Id: I52d989c8a387faf5894f7dbb526984648b83c7a3
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/3rdparty/scion-tests/scxml-test-framework/test/w3c-ecma/test487.txml.scxml | 4 | ||||
| -rw-r--r-- | tests/auto/scion/tst_scion.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/3rdparty/scion-tests/scxml-test-framework/test/w3c-ecma/test487.txml.scxml b/tests/3rdparty/scion-tests/scxml-test-framework/test/w3c-ecma/test487.txml.scxml index 30a50eb..39780e0 100644 --- a/tests/3rdparty/scion-tests/scxml-test-framework/test/w3c-ecma/test487.txml.scxml +++ b/tests/3rdparty/scion-tests/scxml-test-framework/test/w3c-ecma/test487.txml.scxml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?><!-- test illegal assignment. error.execution should be raised. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0"> +<?xml version="1.0" encoding="UTF-8"?><!-- test illegal assignment. error.execution should be raised. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0" name="test487"> <datamodel> <data id="Var1" expr="return"/> </datamodel> @@ -14,4 +14,4 @@ <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/tst_scion.cpp b/tests/auto/scion/tst_scion.cpp index f6aa511..40da0a6 100644 --- a/tests/auto/scion/tst_scion.cpp +++ b/tests/auto/scion/tst_scion.cpp @@ -378,7 +378,8 @@ bool TestScion::runTest(QScxmlStateMachine *stateMachine, const QJsonObject &tes MySignalSpy stableStateSpy(stateMachine, SIGNAL(reachedStableState(bool))); MySignalSpy finishedSpy(stateMachine, SIGNAL(finished())); - if (!stateMachine->init()) { + if (!stateMachine->init() && stateMachine->name() != QStringLiteral("test487")) { + // test487 relies on a failing init to see if an error event gets posted. qWarning() << "init failed"; return false; } |