diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-03-24 12:16:08 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-03-26 17:25:40 +0000 |
commit | 69b11f636f61a2a51333fe1ef69d5fcdf7ff0b9e (patch) | |
tree | ea9da3e27cce3732c92b0fe5376d55b3f9379bb9 /tests | |
parent | 85adc13ac3e5bb82dc7eeeae17886b5d35fcd77f (diff) |
Deduplicate QScxmlStateMachine ctor and remove didChange
The didChange parameter to reachedStableState() is rather confusing as
a "true" does not denote that the new state is different from the
previous one. It just tells us that at least one microstep was
performed. This information is not very useful to users of the API, so
let's drop it.
Change-Id: Ia59e9ad98d813b151429fa0067ab26d007eb4c26
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/scion/tst_scion.cpp | 4 | ||||
-rw-r--r-- | tests/auto/statemachine/tst_statemachine.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/scion/tst_scion.cpp b/tests/auto/scion/tst_scion.cpp index 86a4403..92dc291 100644 --- a/tests/auto/scion/tst_scion.cpp +++ b/tests/auto/scion/tst_scion.cpp @@ -359,7 +359,7 @@ static bool playEvent(QScxmlStateMachine *stateMachine, const QJsonObject &event } stateMachine->submitEvent(e); - if (!MySignalSpy(stateMachine, SIGNAL(reachedStableState(bool))).fastWait()) { + if (!MySignalSpy(stateMachine, SIGNAL(reachedStableState())).fastWait()) { qWarning() << "State machine did not reach a stable state!"; } else if (verifyStates(stateMachine, eventDescription, QLatin1String("nextConfiguration"), counter)) { return true; @@ -383,7 +383,7 @@ static bool playEvents(QScxmlStateMachine *stateMachine, const QJsonObject &test bool TestScion::runTest(QScxmlStateMachine *stateMachine, const QJsonObject &testDescription) { - MySignalSpy stableStateSpy(stateMachine, SIGNAL(reachedStableState(bool))); + MySignalSpy stableStateSpy(stateMachine, SIGNAL(reachedStableState())); MySignalSpy finishedSpy(stateMachine, SIGNAL(finished())); if (!stateMachine->init() && stateMachine->name() != QStringLiteral("test487")) { diff --git a/tests/auto/statemachine/tst_statemachine.cpp b/tests/auto/statemachine/tst_statemachine.cpp index 9ee9aa4..913ec86 100644 --- a/tests/auto/statemachine/tst_statemachine.cpp +++ b/tests/auto/statemachine/tst_statemachine.cpp @@ -110,7 +110,7 @@ void tst_StateMachine::activeStateNames() QScopedPointer<QScxmlStateMachine> stateMachine(QScxmlStateMachine::fromFile(scxmlFileName)); QVERIFY(!stateMachine.isNull()); - QSignalSpy stableStateSpy(stateMachine.data(), SIGNAL(reachedStableState(bool))); + QSignalSpy stableStateSpy(stateMachine.data(), SIGNAL(reachedStableState())); stateMachine->init(); stateMachine->start(); |