summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
index 64f8d3aa9b..436b386a28 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
@@ -1912,11 +1912,16 @@ void tst_QStateMachine::parallelRootState()
QSignalSpy startedSpy(&machine, SIGNAL(started()));
QVERIFY(startedSpy.isValid());
- QTest::ignoreMessage(QtWarningMsg, "QStateMachine::start: No initial state set for machine. Refusing to start.");
+ QSignalSpy finishedSpy(&machine, SIGNAL(finished()));
+ QVERIFY(finishedSpy.isValid());
machine.start();
- QCoreApplication::processEvents();
- QEXPECT_FAIL("", "parallel root state is not supported (QTBUG-22931)", Continue);
- QCOMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.count(), 1);
+ QCOMPARE(machine.configuration().size(), 4);
+ QVERIFY(machine.configuration().contains(s1));
+ QVERIFY(machine.configuration().contains(s1_f));
+ QVERIFY(machine.configuration().contains(s2));
+ QVERIFY(machine.configuration().contains(s2_f));
+ QTRY_COMPARE(finishedSpy.count(), 1);
}
void tst_QStateMachine::allSourceToTargetConfigurations()